SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -03: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
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
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
Linzolle
9807a2f9e0
pin removal and gun examine things
2021-11-29 17:22:13 -07:00
Linzolle
afe81f711b
Merge branch 'winterball2021' of github.com:keronshb/Citadel-Station-13 into winterball
2021-11-26 18:46:57 -07:00
Lin
e3a5391250
Merge pull request #14868 from Arturlang/admin_mapsave
...
buildmode mapgen tool save [ready]
2021-11-24 17:32:48 +00:00
LetterN
41e5034005
i forgot about this component. Lavaland should have sounds now
2021-11-22 14:18:46 +08:00
LetterN
8dcfea5817
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-21 10:34:14 +08:00
keronshb
af83fb9611
FestiveMap 2021
2021-11-20 12:04:35 -05:00
Lin
43e4c71d04
Merge pull request #15384 from SandPoot/acid-bgone
...
Acid overlay no longer lingers after done
2021-11-19 23:02:49 +00:00
Artur
99dedb54ed
Merge remote-tracking branch 'upstream/master' into admin_mapsave
2021-11-20 00:16:56 +02:00
SandPoot
9d3857c94e
Upload files
2021-11-18 14:57:19 -03:00
Lin
4e407ffeb6
Merge pull request #15371 from DeltaFire15/unintended-devastation
...
Devastation level explosions no longer delete organs of gibbed humans
2021-11-17 16:19:23 +00:00
DeltaFire
ef9c90d512
embeds, unarmed and wounds
2021-11-16 20:26:38 +01:00
LetterN
fa6946fae4
added the funny. Also adds balloon_alert to more stuff (primarily atmos)
2021-11-16 16:10:12 +08:00
DeltaFire
6aa906395c
not a gaius reference
...
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
DeltaFire
7d2ff194d1
this WILL fail CI
...
hnnnngh
2021-11-14 20:48:41 +01:00
Putnam3145
5f6a692a08
Makes ashwalkers not freeze to death on lavaland
...
their lungs can't handle 280 or below lol
2021-11-13 15:52:09 -08:00
LetterN
8b16653744
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-12 08:50:23 +08:00
keronshb
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04:00
Trilbyspaceclone
5bd9b440a9
Ashen tree!
2021-11-01 11:27:42 -04:00
LetterN
89f7cf1c32
i apparently didnt commit this?
2021-10-30 13:46:54 +08:00
silicons
a32eabb7ae
fix
2021-10-29 22:44:01 -07:00
silicons
186b552103
merge
2021-10-29 21:50:58 -07:00
LetterN
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
LetterN
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
keronshb
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
keronshb
c80d65df73
Merge branch 'master' into familyport
2021-10-28 14:34:20 -04:00
LetterN
f7b898a2a9
frontend
2021-10-28 17:34:52 +08:00
LetterN
49940c373e
tgui backend
2021-10-28 12:51:31 +08:00
Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
silicons
a14549d07b
Merge pull request #15299 from Hatterhat/cgau
...
funny hands gaming - adds proto-kinetic gauntlets
2021-10-27 13:36:08 -07:00
