Commit Graph

168 Commits

Author SHA1 Message Date
zerothebigboy
a2a8ab12c6 Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum 2021-02-10 20:01:09 -05:00
zerothebigboy
ec8029b0cc a couple more fixes 2021-02-10 20:00:04 -05:00
zeroisthebiggay
969ac7e5e4 now no longer wrong
now no longer wrong
2021-02-10 19:01:08 -05:00
zerothebigboy
00d7b0c9c9 Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum 2021-02-10 18:57:05 -05:00
zerothebigboy
de2e410c6f a bit more stuff 2021-02-10 18:55:56 -05:00
zeroisthebiggay
73020eba35 information here is wrong
information here is wrong
2021-02-10 14:27:14 -05:00
zerothebigboy
87eb447c10 some final touch ups 2021-02-10 14:22:04 -05:00
zerothebigboy
a93e089d2a two hours for aesthetics 2021-02-10 00:12:27 -05:00
zerothebigboy
097666a71a un 2021-02-09 18:49:45 -05:00
zerothebigboy
7d60d27a6f fun 2021-02-09 17:31:24 -05:00
zerothebigboy
85886f563f f 2021-02-08 16:59:54 -05:00
silicons
a41e1b1077 Update ninjaDrainAct.dm 2020-12-18 05:00:16 -07:00
silicons
029c755e15 Update ninjaDrainAct.dm 2020-12-16 02:49:37 -07:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
Timothy Teakettle
58737e42b9 empulse using range 2020-09-10 19:52:34 +01:00
timothyteakettle
e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
silicons
33d5ba788b aight 2020-07-24 20:19:18 -07:00
timothyteakettle
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
Timothy Teakettle
95b8cd3956 first port 2020-06-10 20:33:01 +01:00
Detective-Google
bd37d45334 Ports TG Icemoon framework and map (#49680) (#12002)
* ports all the tg junk for icemoon, not yet changed to make it all compile

* fixes

* fixes

* fixes

* fixes

* fixes

* new stuff

* whew

* fixes

* it compiles, now to fix the maps

* fixes the maps

* fixes solars + removes the space tiles in the toxins burn chamber

* nukes the SpawnTerrain proc used for tg geysers

* linter fix

* fix

* fixes the non matching turf atmos (hopefully)

* more mapping fixes

* dmm2tgm

* unfucks changeturf for the more_caves

* fixes the volanic subtypes of the other thing

* fixes the stupid fucking tile placing list

* some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life

* fixes a bunch of mismatch atmos in ruins

* fixes wendigo cave having no air

* backwards couch backwards couch

* fixes the SM up

* wendigos can't runtime when butchering if you can't butcher them 😎

* makes the wendigo fight have the same atmos as the surrounding icemoon

* Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work

* makes the wendigo screech shake not completely aids

* fixes snowlegion portals dropping proper legions instead of skeles

* brings the engioutpost ruin over as well

* whoopps

* empty commit to reroll bots

* Fixes pirates, ops, the mining base, and gives pirates and ops drills

* fixes lone ops and ninjas

* fixes the snowed plating getting fucked when tiles are placed on it

* removes some OP junk from the wabbajack pool (aka removes non-antag headslugs again)

* more bug fixes

* empty commit to reroll bots

* hopefully finally kills the active turfs on the library ruin

Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com>
2020-05-07 14:46:16 +02:00
Akrilla
5c74e239a0 wew 2020-04-10 03:43:18 +01:00
Putnam3145
658701bf37 Various ghost role QoL; moving holding facility; removing energy net (#11676)
* Removed gay baby jail net from ninja

* Made a proper holding facility for syndicate contractors

* Made ghost role eligibility able to allow reghosting.

* Added a medibot to the holding facility.

* Added new comsigs to every other ghost proc

* Properly dummied out capture objective
2020-03-31 22:04:55 +02:00
Ghommie
f7ce5e5de3 infiltrator sneaky shoes fix. 2020-03-27 14:42:23 +01:00
Ghommie
76ff0d4931 M/F body preferences. 2020-03-22 19:47:48 +01:00
necromanceranne
94c700a06c NVG Nerf/Syndicate NVG Buff (#11548)
* nerfs the shit out of nvg and gives syndicate special flashproof versions

* forgot about this one

* bleh
2020-03-21 15:31:59 +01:00
Ghommie
2553384c6e Shortcut fix for a sticky situation. 2020-03-16 01:23:12 +01:00
Lin
1a36d6e6fa Merge pull request #10770 from Ghommie/Ghommie-cit536
Removes an unused file and another outdated one.
2020-03-07 17:59:12 -06:00
Lin
3dfd7a5ea4 Merge pull request #11356 from Citadel-Station-13/kevinz000-patch-19
Nerfs ninja stungloves to match new batons
2020-03-07 17:50:54 -06:00
kevinz000
5aacdded63 Update gloves.dm 2020-03-06 06:23:56 -07:00
kevinz000
2f83492451 Update ninjaDrainAct.dm 2020-03-06 06:23:13 -07:00
Kraseo
ad20fb1a0e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-06 11:58:11 +01:00
kevinz000
9420424c8f Merge pull request #11332 from Ghommie/Ghommie-cit603
Replaces EXCEPTION() with stack_trace() and CRASH()
2020-03-06 00:14:13 -07:00
Ghommie
bb7bfc04cc Replaces EXCEPTION() with stack_trace() and CRASH() 2020-03-05 01:47:04 +01:00
Kraseo
e5e05d5d61 handles cases where stripping plasmamen would not give them what they need to not die 2020-03-02 11:47:44 +01:00
kevinz000
0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Trilbyspaceclone
b7c3582d86 Update outfit.dm 2020-02-12 14:29:19 -05:00
Trilbyspaceclone
be58994538 Update outfit.dm 2020-02-11 15:43:17 -05:00
Ghommie
da90b67d07 Removes an unused file and outdated procs. 2020-01-29 06:01:23 +01:00
kevinz000
f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghommie
686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
Ghommie
4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghommie
542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Ghommie
ccd966ed28 Update, fix. 2019-12-04 20:32:25 +01:00