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
Artur
be46eba465
Moves stasis handling to component-based
2022-04-07 14:10:51 +03: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
c36019bf56
Adds stasis beds
2022-04-06 15:38:05 +03:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
Solaris-Shade
5596b04f5c
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-22 20:37:16 -04:00
BlueWildrose
ac1c3511b1
Advanced mutation toxin nerf; new cure, removes instant subspecies transformation ( #15497 )
...
* Advanced mutation toxin nerf
* Adv Mut Toxin nerf fix - needs all cures to FALSE
2022-03-22 17:17:18 +01:00
Solaris-Shade
fb4e27e536
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-21 17:21:14 -04:00
Lin
22a49c1dd7
Merge pull request #15564 from SandPoot/bad-getatomonturf
...
Fixes balloon alerts sourced on turfs
2022-03-20 22:30:34 +00:00
Solaris-Shade
d9ff37d2ff
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-19 11:23:16 -04:00
SandPoot
16fddbb140
Upload files
2022-03-18 18:35:29 -03:00
SandPoot
3ee2d12b34
Upload files
2022-03-18 12:45:07 -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
25bcad7be8
Update code/datums/components/armor_plate.dm
2022-03-16 18:06:25 -03:00
SandPoot
baee52349b
Upload files
2022-03-16 15:41:07 -03:00
SandPoot
a8f454bd72
Upload files
2022-03-16 14:00:31 -03:00
silicons
861a9f854f
Merge pull request #15476 from DeltaFire15/core-alt-pr
...
Buffs regen core healing for robots on lavaland, nerfs regen cores when not on lavaland
2022-03-13 14:26:06 -07:00
Solaris-Shade
0395ba47d7
Merge branch 'master' into Projectile_Rework
2022-03-11 23:07:31 -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
Lin
ae5896d6cf
Merge pull request #15525 from keronshb/ambitioncheck
...
Ambitions from Skyrat
2022-02-27 02:34:13 +00:00
keronshb
1415b9580f
Last fixes
2022-02-25 22:29:09 -05: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
keronshb
3ea22f97a6
Merge remote-tracking branch 'upstream/master' into ambitioncheck
2022-02-22 17:10:25 -05:00
silicons
ce6e8c99c6
fixes
2022-02-15 21:56:36 -07:00
keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
silicons
af6e43c595
refactors clickcatchers/parallax/fullsceren ( #15460 )
...
* :)
* that
* move those there
* refactor that too
* wew
* stuff
* almost.
* sigh
* just need speed
* stuf
* pain
* hm
* tweaks
* that
* eh
* wack
* a
* done
* that's important
* wacky
* all that
* fixes
* typo
* that
* a
* funny
* that
* that
* woo
* help im losing my fucking mind
* okay
* fix
2022-02-07 15:17:24 -08:00
SandPoot
7e970fe5f1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into changelogs-tgui
2022-02-04 13:06:20 -03:00
silicons
c0e097f589
Merge pull request #15484 from DeltaFire15/adaptation
...
Space Adaptation nulls low-pressure cooling penalties of passive cooling for Synthetics.
2022-02-04 07:58:44 -08:00
Sakura
08b38a7e70
Ashwalker Update ( #15466 )
...
* Ashwalker Update
* Update generic_positive_events.dm
* Update ashwalker.dm
* fixing newlines
* Update code/modules/antagonists/_common/antag_datum.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
* literally 1984
* unlimiting spawns
* Create antag_datum.dm.bak
* Revert "Create antag_datum.dm.bak"
This reverts commit d91e1f4c4d9c86bc4a275ef19f45e8927dd93cae.
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2022-02-03 19:34:15 -08:00
SandPoot
29be8573ea
Upload files
2022-02-02 02:01:04 -03:00
DeltaFire
e71e86cf23
adapted
2022-01-29 16:43:03 +01:00
DeltaFire
1d1a153808
buffnerf
...
buffs cores for robots on lavaland
nerfs cores when not on mining z
2022-01-22 19:17:05 +01:00
LetterN
7e326ed947
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2022-01-22 20:42:55 +08:00
silicons
2b726d7670
Merge pull request #15324 from Trilbyspaceclone/ashtree
...
Ashen tree!
2022-01-22 04:34:28 -08:00
LetterN
18b7069f1f
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2022-01-11 09:49:38 +08:00
Lin
d7cbb017f6
Fix few instances of bleeding white blood ( #15398 )
...
* no longer bleed white blood
* parentheses man
* fix that one bdm map spawn too
2022-01-09 17:23:48 +01:00
SandPoot
8510dcc08a
Ports tgui stripping (finally) ( #15401 )
...
* Upload files
* Update items.dm
* Update files
* Update files
* Update strippable.dm
* Update strippable
* Update strippable.dm
* Upload files
* Update files
* Update files
* Update files
* update files
* Update files
* Update dog.dm
* Update strippable.dm
* Update equipping
* Update strippable.d
* Upload files
* Upload files
* Update monkey.dm
2021-12-30 07:40:15 +01:00
keronshb
83a62ace04
Ambitioncheck
2021-12-23 21:15:31 -05:00
LetterN
fab4b07be5
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-12-21 07:59:33 +08:00
silicons
03e8c32acd
Merge pull request #15402 from Linzolle/pinremoval
...
finally change pin removal from crafting to tools
2021-12-19 18:54:50 -08:00
Lin
a9c12e3762
Merge pull request #15424 from SandPoot/centralize-borg-speech
...
Centralizes dogborg speech even inside something
2021-12-10 03:44:43 +00:00
SandPoot
30426ad011
Upload chatmessage.dm
2021-12-08 23:36:42 -03:00
Lin
76fbc0994f
ball map weather ( #15405 )
2021-12-08 18:49:43 +01:00
DeltaFire
e576962ac3
e
2021-12-03 18:29:13 +01:00
Lin
5dc9704e5d
Merge pull request #15380 from DeltaFire15/oops-all-wounds
...
Block & Pellet wound pass
2021-11-30 20:24:42 +00:00
