Commit Graph

1670 Commits

Author SHA1 Message Date
Peptide90
433771f0ec moves all tile copyright to robust generic attribution format RGA (#10104)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-07-30 19:57:11 -07:00
CormosLemming
e227f208bc Changes popcorn sprite to have the number fourteen instead of thirteen. (#10134) 2022-07-30 19:56:04 -07:00
Peptide90
53ff974e67 Salvage vendor (#10112)
* adds basics for salvage vendor

* adds floodlights to vendor

* adds knife and pka to vendor

* adds the mining vendor sprite

* fixes flashlight ID...smh
2022-07-30 19:31:50 -07:00
Nemanja
b39462c722 missing sprites for syndi bags (#9956) 2022-07-28 09:32:43 +10:00
Moony
c6a3c8d547 Rectifying attribution error(s). (#10090)
* Rctifying attribution error(s).

* Update copyright.txt

* Update Resources/Textures/Tiles/copyright.txt

Co-authored-by: ZeWaka <zewakagamer@gmail.com>

Co-authored-by: ZeWaka <zewakagamer@gmail.com>
2022-07-27 14:14:49 -05:00
Kara
7a553781cc Frezon (#9980)
* stuff i'll have to fix anyway when n2o gets merged

* everything except the finished reactions

* freon coolant reaction but with bad curve

* miasmic subsumation

* freon production

* nitrogen and diff temp scaling

* uhh meant to change that

* #

* hitting that frezon boof
2022-07-27 04:55:28 -05:00
Kara
ae71b15a7d Vampire cloak (#10073) 2022-07-27 01:15:47 -07:00
Rane
1c8bdaf7c4 Sleeping (#9793) 2022-07-26 21:46:24 -07:00
Rane
e36b155325 Port boxer from Nyano (#9080) 2022-07-26 18:34:19 -07:00
Rane
57206eb49c Port medibot + bot spawners from nyano (#9854)
* Port medibot + bot spawners from nyano

* Make the injection thresholds constants

* Remove warning

* Check against const in system too

* resolving systems just isn't worth it

* only resolve entity manager once

* Reduceother resolves too

* fix post-merge

* woops
2022-07-25 10:33:31 -05:00
T-Stalker
698976029c Adds axolotl and snake hood frills for reptilians! (#10013) 2022-07-25 15:47:04 +10:00
metalgearsloth
bfac53e7bc Per-map parallax support (#9786)
* Per-map parallax support

* Comments for future sloth

* c

* bet

* Fix exception

* VV support

* Fix parallax

* mem

* weightless sounds

* Gravity stuff

* placeholder coz im too lazy to stash don't @ me son

* decent clouds

* sky

* Fast parallax

* Imagine spelling

* Loicense

* perish

* Fix weightless status

Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-07-25 00:10:23 -05:00
metalgearsloth
40a7584c2f Gas tank internals alerts (#9567) 2022-07-25 14:42:25 +10:00
TaralGit
c4dd5b676c guns (#9958)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-07-24 21:25:41 +10:00
lapatison
f94e3743b2 Centered shot glass sprite (#9986) 2022-07-23 18:47:02 -07:00
Moony
e2378c72b8 i forgor (#9951) 2022-07-21 18:07:12 -05:00
Moony
f98df73fae Adds even more smites and a bunch of tools. (#9825)
* Adds three new smites, headstand, locker stuff, and reptilian species swap.

* Localize all the smites.

* save work

* More smites...

* Final tweaks.

* oops

* !PLEH

* Adds disarm prone and improved hand removal options.

* fix chances.

* take out the trash.

* Add some admin TRICKS instead of more smites.

* oop

* Implements the admin test arena and associated trick.

* Tricks for granting/revoking access.

* e

* mfw

* Implement quick dialogs, for when you don't want to spend 20 minutes writing a simple dialog prompt.

* Forgot the rejuv icon.

* E

* docs

* augh

* Add rename/redescribe buttons.

* Adds objects menu, implements a couple tricks for stations.

* 1984

* Adds a trick for effectively infinite power.

* fixes some icon uggo.

* a

* HALT!

* Pause/unpause buttons.

* Forgor the textures.

* they broke every bone in their body.

* i added more

* more battery actions, touch up battery icon.

* Address reviews.
2022-07-21 17:30:00 -05:00
drakewill-CRL
d02e2dad26 Antag menu (#9900)
* Refactor traitor generation code.

* RandomTraitorAlive no longer crashes when 1 traitor. Also cleaner/faster

* Add Antag menu for admins, add Traitor to the list.

* Add zombie to admin-antag menu

* Pirates, lone op, make traitor consistent with the rest.

* Add name strings

* cleaned usings.

* Cleanup.

Co-authored-by: drakewill <drake@drakewill-crl>
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2022-07-20 04:46:23 -05:00
Rane
1e8efb1dd5 Port cleanbots from Nyano (#9853) 2022-07-17 22:48:36 -05:00
13spacemen
211395b975 Adds Research, Virology, Glass Maint Airlocks (#9350) 2022-07-16 15:35:39 -07:00
Rane
188934a748 Portable scrubbers (#9417) 2022-07-15 05:46:30 -07:00
Deahaka
689b03ce4a Altars add (#9678) 2022-07-15 02:17:26 -07:00
Rane
abab5bedcd Port honkbots from nyano (#9698) 2022-07-15 00:54:34 -07:00
Kara
e43915c94a Proto-kinetic accelerator (#9748) 2022-07-15 14:28:14 +10:00
Deahaka
ed0cf3a3b4 Operating table add (#9687) 2022-07-14 19:50:59 -07:00
Kara
ad7889e8a9 Magic staves + wands (#9070) 2022-07-14 19:45:27 -07:00
TaralGit
ccefd0caf0 RPG-7, Kardashev rifle and Hristov heavy sniper resprites (#9729)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-07-14 08:37:57 -07:00
Rane
83c03b60a1 [2 lines] fix blinding (#9690)
* Adds blinding + blindfolds (#8688)

* Adds blinding + blindfolds

* Don't break examining lol

* moment

* fix toggle lights behavior

* move checks around

* Sloth review

* Added a salvage funny

* review

* woops

* Switch circle shader

Co-authored-by: wrexbe <wrexbe@protonmail.com>

* resolve merge conflict

Co-authored-by: wrexbe <wrexbe@protonmail.com>
2022-07-14 06:58:24 -05:00
Deahaka
485dfa3749 Hospital curtains add (#9707)
* curtainss

* sound_mono

* hotfix_curtains
2022-07-14 06:53:17 -05:00
Moony
a655891a8d Revert "Adds blinding + blindfolds (#8688)" (#9689)
This reverts commit 7a7ab5e8c1.
2022-07-13 16:50:35 -05:00
Moony
ef6d0344de Revert "Fireaxe resprite" (#9676) 2022-07-13 10:22:31 +02:00
ChilbroBaggins
abc8d5b6d8 Food and Beverage Spawners (#9547)
* Textures to make lamps mappable to East/West.

* Adds various rng food and beverage spawners for mapping. Also adds a smaller icon for rndm arcade machine because the other was triggering people.

* Fix

* ugh

* edits

* Oops, missed a couple xenos

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2022-07-12 19:03:10 -05:00
KIBORG04
71c8d08e4c Kvass (#9082)
* add kvass

* nevermind

* forgot about double 's'

* Update tanks.yml

* gotovo

* Update meta.json
2022-07-11 23:11:12 -07:00
Delete69
21a56f4b80 Cleans up warning line decals (#8731)
* letsa go

* indentations

* added back old decals

* this thing

* maybe this

* jfc
2022-07-11 23:03:35 -07:00
Rane
7a7ab5e8c1 Adds blinding + blindfolds (#8688)
* Adds blinding + blindfolds

* Don't break examining lol

* moment

* fix toggle lights behavior

* move checks around

* Sloth review

* Added a salvage funny

* review

* woops

* Switch circle shader

Co-authored-by: wrexbe <wrexbe@protonmail.com>
2022-07-11 22:55:04 -07:00
Emisse
fb6586cdc6 Lamp Plushie (#9118)
* Update meta.json

* Add files via upload

* Update toys.yml

* Update toy.yml

* Update toys.yml
2022-07-10 20:13:16 -05:00
Leon Friedrich
65408f63d4 Injector sprite fix (#9011) 2022-07-09 02:59:39 -07:00
metalgearsloth
5107bc3be7 Bullet impact effects (#9530) 2022-07-09 13:46:11 +10:00
Deahaka
a7e4152171 Fireaxe resprite (#9302)
* fieraxe

* traitor-fireaxe
2022-07-08 20:03:20 -07:00
Ablankmann
d4c5381a09 BEHOLD! The MagiVend! (#9440)
* Magivend Sprites, and Entity stuffs

* Oopsie!
2022-07-08 19:40:49 -07:00
Nemanja
e36a4e44f5 sprite fix (#9542) 2022-07-09 04:09:27 +10:00
ChilbroBaggins
ad46c4669a Textures to make lamps mappable to East/West. (#9414)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2022-07-07 11:47:05 -07:00
Kara
7e34124244 Emergency light goodies (#9352)
Co-authored-by: Jacob Tong <10494922+ShadowCommander@users.noreply.github.com>
2022-07-07 09:16:48 -07:00
TaralGit
f6da17d7d9 highlights (#9332)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-07-06 19:57:23 +10:00
metalgearsloth
40eecdd78a Stamina damage (#9230) 2022-07-06 18:06:12 +10:00
metalgearsloth
a2a5df1990 Damage masks (#9402) 2022-07-06 17:58:14 +10:00
Nemanja
836c0bb1c4 Zombie Mode [New Game Mode] (#8501)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-07-06 13:42:51 +10:00
Rane
723004a300 Tiny fans for freezers/shuttles (#9451) 2022-07-05 14:54:27 -05:00
ninruB
3c4998649b Make the extra bright lantern actually flash you. (#9387)
* lantern goes STUN STUN

* fix an awkward extra spacebar

* fixing the lantern as emogarbage suggested

* buffs the usage amount

ngl, 15 might be a bit over the top, but it is several times larger than a normal flash so it somewhat makes sense.

* fixed encoding
2022-07-05 11:40:19 -07:00
Aerocrux
064e34e9c5 Fix invisible held sprites for capgun (#9390)
* Fix capgun YAML for held sprites and touch up in-hand sprites

* Remove capgun size to inherit BaseItem size 5
2022-07-05 10:09:54 -07:00