Commit Graph

185 Commits

Author SHA1 Message Date
Lin
c310b1a70e Merge pull request #12997 from silicons/lavastaff
fixes medsprays, sutures/regenmesh, and lavastaves not respecting clickdelay (rip instant chemdump heal on self)
2020-08-05 19:43:38 -05:00
silicons
8b2163792a Update necropolis_chests.dm 2020-08-01 21:05:23 -07:00
silicons
20dea7e41f fix 2020-08-01 20:45:49 -07:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
silicons
5bf4afcade sigh 2020-07-27 14:09:37 -07:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
703afec454 ok 2020-07-23 08:57:15 -07:00
kappa-sama
c92abfe2ce bruh 2020-07-20 21:18:39 -04:00
silicons
692656b02d Whew 2020-07-20 11:53:33 -07:00
kappa-sama
3676b03f28 experiment 2020-07-20 14:53:22 -04:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
Lin
ba3dc6a73b Merge pull request #12679 from silicons/unarmed_parry
Ok ok hear me out: Implements unarmed parry.
2020-07-18 17:02:02 -05:00
YakumoChen
072b4b673f set hierophant friendly fire to on by default 2020-07-13 09:40:58 +00:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
kevinz000
445d94f335 haha whew 2020-06-17 21:32:10 -07:00
Detective Google
fa5bae14f1 no 100% chance doomsday :^) 2020-06-13 22:14:23 -05:00
Ghom
4c3dac467f Mining inquisitor/berserker hardsuit nerf, slight drake armor buff. (#12289)
* Mining inquisitor/berserker hardsuit nerf, slight drake armor buff.

* Pretty unlikely you'll be hit by more than a handful spells in a single round.

* aaaa

* Update miscellaneous.dm
2020-05-18 16:55:40 -07:00
Ghommie
2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02: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
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
kevinz000
6754b794b1 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-20 22:59:17 -07:00
Ghommie
32975bf509 More bug reports yee'd their last haw. 2020-03-18 23:43:23 +01:00
kevinz000
6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000
a77be038b8 refactoring this whole thing again 2020-03-16 04:56:32 -07:00
kevinz000
3ae8016ec8 Merge pull request #11373 from kappa-sama/supershotty
miner powercreep starring 150 damage pointblank shotgun
2020-03-11 17:27:22 -07:00
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
2020-03-11 17:01:37 -07:00
Seris02
cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
Ghommie
ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
kappa-sama
1ca4eda4be it begins 2020-03-06 22:58:12 -05:00
Kraseo
170e092a24 this is going to end well 2020-02-25 13:14:18 +01:00
Seris02
c3ec44b0d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-02-22 19:54:10 +08:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Seris02
ac4489c6a8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-11 13:55:29 +08:00
Lin
e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
Lin
c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
Ghommie
f5b251db66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-03 18:24:39 +01:00
Ghommie
37441437d1 a 2019-12-28 23:02:28 +01:00
Seris02
862acf2f06 ports hyper's genetics 2019-12-28 21:33:15 +08:00
Ghommie
b4c0433d6d more work. 2019-12-27 17:45:19 +01:00
Ghommie
53d142b4c0 more work. 2019-12-25 01:34:33 +01:00
Ghommie
ab34faa41d fix taur 2019-12-24 02:01:45 +01:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghommie
5bf252a58c Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls." 2019-12-17 01:57:56 +01:00
Trilbyspaceclone
7c4fab127f Update necropolis_chests.dm 2019-12-09 15:37:22 -05:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Ghommie
8c31c1036d Porting objective code refactor 2019-11-04 22:05:04 +01:00
Ghommie
80cd4902ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273 2019-10-28 00:49:22 +01:00
Ghommie
ad7101d0aa ports anti-magic component code updates (holymelon not included). 2019-10-25 03:20:42 +02:00
Ghommie
e991328087 progress 2019-10-19 15:02:56 +02:00