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
silicons
904990a037
Merge pull request #15584 from Arturlang/StasisBeds
...
Stasis beds
2022-04-08 09:47:26 -07:00
Solaris-Shade
48db01702b
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-04-06 22:31:51 -04:00
silicons
c8cab13081
Merge pull request #15565 from SandPoot/custom-statues
...
Custom statues and sculpting changes.
2022-04-06 12:12:24 -07: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
416c7412c8
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-04-04 16:58:17 -04:00
Lin
3d04fac657
Merge pull request #15576 from Putnam3145/fix-recycler-runtime
...
Fix recycler runtime
2022-04-02 07:17:31 +00:00
Lin
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
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
06528b61ae
Update files
2022-03-30 22:32:58 -03:00
Putnam3145
06bda8946a
wait, no, that's Lua-like, not even right
2022-03-30 14:55:15 -07:00
Putnam3145
a819424088
Fixes recycler runtime on emergency stop
2022-03-30 14:53:58 -07:00
Solaris-Shade
01f28163c2
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-24 20:40:31 -04:00
SandPoot
8cfb7a1bf4
They no longer snap south!
2022-03-24 01:03:42 -03:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
DeltaFire
a8ff45ca16
fix
2022-03-22 18:05:58 +01:00
Solaris-Shade
d9ff37d2ff
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-19 11:23:16 -04:00
SandPoot
11daaadf79
arguments.
2022-03-18 18:43:40 -03:00
SandPoot
16fddbb140
Upload files
2022-03-18 18:35:29 -03:00
SandPoot
96e38e965b
Merge branch 'master' into mechs-are-vehicles
2022-03-17 22:23:48 -03:00
SandPoot
4da5a57688
global
2022-03-16 18:33:32 -03:00
SandPoot
11522b7761
global var
2022-03-16 18:21:37 -03:00
SandPoot
baee52349b
Upload files
2022-03-16 15:41:07 -03:00
SandPoot
fdb6413d23
You guys want some logs?
2022-03-16 15:22:04 -03:00
SandPoot
a8f454bd72
Upload files
2022-03-16 14:00:31 -03: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
a478945424
Merge conflict one
2022-03-11 22:49:16 -05:00
Solaris-Shade
171bd18c8a
Updated Projectile code some more.
2022-03-11 22:23:01 -05:00
silicons
4cd8753a23
Merge pull request #15543 from timothyteakettle/floor-tile-moment
...
spraypainting a stack of floor tiles makes the placed tile the same colour!
2022-03-10 16:51:18 -07:00
silicons
2a5a79f751
Merge pull request #15536 from SandPoot/JPS
...
Implements JPS (Jump Point Search) Pathfinding
2022-03-10 16:51:07 -07:00
Timothy Teakettle
59451d9088
Update plating.dm
2022-03-07 19:45:58 +00:00
Timothy Teakettle
1f00f61380
Update plating.dm
2022-03-07 19:45:27 +00:00
Solaris-Shade
c5be81c589
tg moved projectiles out of /item, added '/item' back
2022-03-06 16:29:58 -05: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
21b68944e7
Upload files
2022-03-05 16:00:12 -03:00
SandPoot
45a49c6106
Upload files
2022-03-05 13:49:26 -03:00
silicons
edd3a510f1
Merge pull request #15526 from timothyteakettle/bartender-pda
...
adds bartender cartridge for drink recipe searching, updates chemist cartridge to have equivalent functionality for all recipes
2022-02-26 18:08:47 -07:00
silicons
bf9afd846d
Merge pull request #15528 from SandPoot/time-to-kill-this-broken-system
...
[PORT] Removes the non bitflag slot defines
2022-02-26 18:08:28 -07:00
silicons
fe427e7516
Merge pull request #15503 from Arturlang/Bodybuilding
...
Lets the limbgrower make mobs with only a chest
2022-02-26 18:08:12 -07:00
SandPoot
f7ea1f377d
oops, replace all is a hell of a drug
2022-02-25 17:09:31 -03:00
SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
Timothy Teakettle
56547a2556
generalizes recipe searching, adds chemistry functionality
2022-02-23 11:38:04 +00:00
timothyteakettle
4adb870324
improves formatting of the couldn't find reagent text
2022-02-23 00:57:39 +00:00
timothyteakettle
b578c65d74
fixes
2022-02-23 00:52:17 +00:00
SandPoot
6c347a9186
Fixes targets ( #15521 )
...
* Automatic changelog compile [ci skip]
* Update files
Co-authored-by: Changelogs <action@github.com >
2022-02-22 15:50:32 -07:00
