deathride58
134425634f
Merge branch 'master' into update-smooth-movement
2022-06-05 00:45:45 -04:00
deathride58
e75c413d42
Merge pull request #15652 from SandPoot/title-screen
...
Updates the title screen
2022-06-05 00:27:44 -04:00
deathride58
ca879a83f5
Merge pull request #15651 from timothyteakettle/oof-ouch-my-bones!
...
adds paper skin and glass bones quirks
2022-06-05 00:26:55 -04:00
Lin
37cd25109e
Merge pull request #15634 from deathride58/jukeboxrefresh
...
Jukebox refresh - Jukebox queue, working volume knob, emagging, preliminary multiz support, and more!
2022-06-01 21:18:02 +00:00
SandPoot
8bb1c2b32a
Upload files
2022-05-30 01:31:54 -03:00
Timothy Teakettle
411a5c63ee
paper skin, glass bones
2022-05-29 20:04:49 +01:00
SandPoot
fd676bfe50
Upload files
2022-05-24 13:08:27 -03:00
Putnam3145
578415d3fc
adds milk to pool blacklist
2022-05-22 04:42:40 -07:00
deathride58
113981b5a8
Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more!
2022-05-21 00:21:58 -04:00
SandPoot
da1f58f297
Update files
2022-05-19 13:23:17 -03:00
Lin
e8947a4e4d
Merge pull request #15624 from timothyteakettle/better-quirk-menu
...
quirks are now organised into three tabs for positive, neutral and negative
2022-05-18 03:29:07 +00:00
Timothy Teakettle
1c9f6077da
loadout organisation
2022-05-16 21:22:22 +01:00
Lin
a899b5db81
Merge pull request #15607 from Putnam3145/auxmos-1
...
Updates auxmos to 1.0 (plus other atmos stuff with it)
2022-05-13 05:45:33 +00:00
Lin
dec7751f95
Merge pull request #15612 from SandPoot/status_displays
...
Syncs status displays to tg's version
2022-05-12 20:11:54 +00:00
SandPoot
90eab441aa
Upload files
2022-05-09 18:50:17 -03:00
silicons
73741102ac
Merge pull request #15606 from timothyteakettle/salt-quirk
...
an actual salt pr (adds sodium sensitivity quirk)
2022-05-02 17:02:23 -07:00
Putnam3145
a7408beb4c
Updated auxmos to 1.0
2022-04-28 21:07:51 -07:00
silicons
004e91c743
Merge pull request #15602 from Putnam3145/lavaland-more-atmos
...
Allow planets to have fuel-based atmospheres
2022-04-27 16:11:15 -07:00
Timothy Teakettle
ac4a41243a
add salt quirk
2022-04-27 14:58:54 +01:00
Putnam3145
b5ce67ce55
Weird reaction stuff
2022-04-26 01:14:41 -07:00
Putnam3145
621b974691
Allow planets to have fuel-based atmospheres
2022-04-25 20:27:01 -07:00
silicons
73d39db3c1
Merge pull request #15343 from SandPoot/deadmin-prefs
...
Ports Automatic Deadminning from TG
2022-04-15 17:44:55 -07:00
silicons
a1268032d6
Merge pull request #15593 from Putnam3145/fix-linux
...
Makes auxmos do fires on Linux
2022-04-15 17:42:05 -07:00
Putnam3145
4d98d7cedb
makes bombs not super OP on linux, too
2022-04-09 22:25:08 -07:00
Lin
fd286c325e
Merge branch 'master' into Projectile_Rework
2022-04-09 04:19:56 +00:00
silicons
dee1db4a3a
Merge pull request #15558 from SandPoot/mechs-are-vehicles
...
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
Artur
66ce34caa5
Signal and moves it to the back
2022-04-07 15:54:13 +03:00
Artur
3824daba05
Trailing newlines
2022-04-06 16:10:57 +03:00
Artur
813ca511b5
Remaps sleepers to stasis beds and make stasis actually leave you
2022-04-06 15:58:27 +03:00
Artur
c36019bf56
Adds stasis beds
2022-04-06 15:38:05 +03:00
Solaris-Shade
a70fb1fb43
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-31 15:29:31 -04:00
BlueWildrose
3687361ba5
Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) ( #15304 )
...
* Butts
* testicle fix + hidden is back
* updated booba
* prob bad idea actually thinking about icon states
* fuck
* this should be everything now
* SandPoot's suggestion
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* tguify that last option
* Revert "tguify that last option"
This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.
* Revert "Merge branch 'master' into cursingcitadel"
This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.
* Revert "Revert "Merge branch 'master' into cursingcitadel""
This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2022-03-30 20:06:00 -07:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
SandPoot
e9637bb688
Merge branch 'master' into deadmin-prefs
2022-03-22 15:35:46 -03:00
Solaris-Shade
d9ff37d2ff
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-19 11:23:16 -04:00
SandPoot
a8f454bd72
Upload files
2022-03-16 14:00:31 -03:00
Lin
c25e074128
Merge pull request #15547 from Putnam3145/extend-min-pop
...
Adds a minimum vote count to continue rounds
2022-03-14 18:48:11 +00:00
silicons
fcfde73f5e
Merge pull request #15425 from DeltaFire15/slower-organ-healing
...
Nerfs* passive organ healing, plus some minor stuff
2022-03-13 14:26:00 -07:00
silicons
a3284a0923
Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf
...
Weakens chemistry's revival chems
2022-03-13 14:24:57 -07:00
Solaris-Shade
0395ba47d7
Merge branch 'master' into Projectile_Rework
2022-03-11 23:07:31 -05:00
Solaris-Shade
171bd18c8a
Updated Projectile code some more.
2022-03-11 22:23:01 -05:00
Putnam3145
9b4c3a5be3
Adds a minimum greater vote count to extend rounds
2022-03-10 21:35:08 -08:00
Solaris-Shade
2fdb70b2b9
[DNM][DNM][WIP] Projectile backend code port and update
...
Ports#54924, #65061 , #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
SandPoot
45a49c6106
Upload files
2022-03-05 13:49:26 -03:00
Lin
ae5896d6cf
Merge pull request #15525 from keronshb/ambitioncheck
...
Ambitions from Skyrat
2022-02-27 02:34:13 +00:00
silicons
2323bd31cd
Merge pull request #15522 from bunny232/wintercoats
...
Insulation works both ways you know.
2022-02-26 18:08:59 -07:00
SandPoot
de96a68bf5
mistake
2022-02-25 17:01:48 -03:00
SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
Lin
fd84b21350
Merge pull request #15523 from Citadel-Station-13/Putnam3145-patch-1
...
Change BOMB_TARGET_SIZE to match new trit fire
2022-02-25 04:41:54 +00:00
Timothy Teakettle
f6b9858f4f
adds snake coiling ( #15514 )
...
* new signals for resting and stop pulling
these are to be used as signals that will cancel the coiling
* Create coiling.dm
* Update coiling.dm
* adds sprite accessory for coiled naga
* main changes that apply the actual visuals to the coiling mechanics
* adds message to coiling, fixes offset, adds action icon
* coil offset was using old direction
* reordering
* fixes coil sprite not disappearing
* fixes offsets, solves loadout issue
* follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant
2022-02-23 22:01:13 -07:00
