c36019bf56
Adds stasis beds
2022-04-06 15:38:05 +03:00
416c7412c8
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-04-04 16:58:17 -04:00
2a884f4e01
Merge pull request #15578 from SandPoot/fix-weird-diagonal
...
Fixes pathfinding not checking diagonal passability properly.
2022-04-02 07:17:02 +00:00
a70fb1fb43
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-31 15:29:31 -04:00
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
06528b61ae
Update files
2022-03-30 22:32:58 -03:00
bfbba7cb06
blocks investigate log access without R_SENSITIVE ( #15573 )
...
* Update admin_verbs.dm
* Update admin_verbs.dm
* Update sql_message_system.dm
2022-03-30 12:42:05 -07:00
6199aa4d60
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-03-30 12:35:12 -07:00
a4f8789d68
DO it not HIT it!
...
https://github.com/tgstation/tgstation/pull/65061
2022-03-24 22:43:17 -04:00
01f28163c2
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-24 20:40:31 -04:00
dbb2db5cc1
Merge pull request #15570 from bunny232/Oral
...
Climax with partner now counts mouth
2022-03-24 21:39:02 +00:00
d711a0901c
Dual seater coming right up.
2022-03-23 13:05:51 -03:00
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
d8f656ecf1
restores EMP behavior
2022-03-23 10:26:58 -03:00
554c38fedf
Update code/modules/arousal/arousal.dm
...
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2022-03-23 05:28:24 -04:00
5596b04f5c
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-22 20:37:16 -04:00
e9637bb688
Merge branch 'master' into deadmin-prefs
2022-03-22 15:35:46 -03:00
8ddf825aa8
Update arousal.dm
2022-03-22 01:22:54 -04:00
ff6ed43bc1
Merge pull request #15438 from LiteralMushroom/patch-5
...
Makes it so alter form can affect eyes.
2022-03-21 18:56:47 -07:00
fb4e27e536
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-21 17:21:14 -04:00
22a49c1dd7
Merge pull request #15564 from SandPoot/bad-getatomonturf
...
Fixes balloon alerts sourced on turfs
2022-03-20 22:30:34 +00:00
d9ff37d2ff
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-19 11:23:16 -04:00
16fddbb140
Upload files
2022-03-18 18:35:29 -03:00
3ee2d12b34
Upload files
2022-03-18 12:45:07 -03:00
96e38e965b
Merge branch 'master' into mechs-are-vehicles
2022-03-17 22:23:48 -03:00
baee52349b
Upload files
2022-03-16 15:41:07 -03:00
aec888a7b6
Update files
2022-03-16 15:17:57 -03:00
a8f454bd72
Upload files
2022-03-16 14:00:31 -03:00
c0da155ad5
Merge pull request #15553 from Putnam3145/fix-explosive-compressor
...
Fix implosion compressor impossibility
2022-03-15 19:24:17 +00:00
e819fbdb83
Merge pull request #15546 from Putnam3145/fix-supermatter-exploit
...
Makes supermatter take damage (and not heal) if too near to spaced turfs
2022-03-14 18:47:09 +00:00
b597675ef4
Fix explosive compressor impossibility
2022-03-14 11:41:20 -07:00
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
a3284a0923
Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf
...
Weakens chemistry's revival chems
2022-03-13 14:24:57 -07:00
cb1848d06c
no more free money ( #15375 )
2022-03-13 12:50:30 -07:00
0395ba47d7
Merge branch 'master' into Projectile_Rework
2022-03-11 23:07:31 -05:00
171bd18c8a
Updated Projectile code some more.
2022-03-11 22:23:01 -05:00
857253a07b
who names a var T.
2022-03-10 21:42:27 -08:00
2a5a79f751
Merge pull request #15536 from SandPoot/JPS
...
Implements JPS (Jump Point Search) Pathfinding
2022-03-10 16:51:07 -07:00
cdefa4f64a
Merge pull request #15535 from SandPoot/statpanel
...
Statpanel update
2022-03-10 16:50:59 -07:00
b1ba1d60f0
Merge pull request #15534 from SandPoot/screentips
...
Screentips
2022-03-10 16:50:28 -07:00
234b3eae8f
Merge pull request #15540 from Citadel-Station-13/more-tritium-enthalpy
...
Adds a LOT more enthalpy to tritium
2022-03-10 16:47:15 -07:00
a44d0af4dc
hackish supermatter dying on spaced nearby turfs
2022-03-09 07:49:02 -08:00
993db66237
Adds a LOT more enthalpy to tritium
2022-03-06 14:54:48 -08:00
c5be81c589
tg moved projectiles out of /item, added '/item' back
2022-03-06 16:29:58 -05:00
062da9bb05
fixed dynamic days (lowertext)
2022-03-06 13:18:59 -08:00
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
7bf1bcf857
Some updates
2022-03-05 16:18:17 -03:00
21b68944e7
Upload files
2022-03-05 16:00:12 -03:00
5f083fbddd
Upload files
2022-03-05 14:22:42 -03:00
45a49c6106
Upload files
2022-03-05 13:49:26 -03:00
Artur