Commit Graph

209 Commits

Author SHA1 Message Date
zeroisthebiggay
2c278ba370 A
A
2020-10-25 05:34:53 -04:00
zeroisthebiggay
5eec2b76f5 OK MAYBE NOT INDESTRUCTIBLE
OK
2020-10-25 05:34:24 -04:00
zerothebigboy
6577aaac91 FRUSTRATION 2020-10-25 05:30:06 -04:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
DeltaFire
9e3710bb51 kev request
malf disk gone from the /misc chest type
2020-09-11 23:19:55 +02:00
DeltaFire
f92b68d591 oh. 2020-09-07 21:12:19 +02:00
Trilbyspaceclone
da641c9b96 Update necropolis_chests.dm 2020-08-30 02:10:59 -04:00
Trilbyspaceclone
9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
silicons
033feebcd0 Merge pull request #12957 from kappa-sama/patch-34
removes malf disk from tendril loot
2020-08-29 21:31:24 -07:00
Timothy Teakettle
1d943a34ef heterochromia 2020-08-28 18:30:28 +01:00
TrilbySpaceClone
3ae10ac826 update? 2020-08-06 13:09:41 -04:00
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
Trilbyspaceclone
dc4d83d2db Update necropolis_chests.dm 2020-08-03 11:06:00 -04:00
Trilbyspaceclone
e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
Trilbyspaceclone
0ec756cce6 the all crate 2020-08-03 10:43:58 -04: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
kappa-sama
94ee8bec08 ok 2020-08-01 19:19:59 -04:00
kappa-sama
adf4a8a2e3 indent 2020-07-31 17:10:06 -04:00
kappa-sama
cc34c4b1a2 no empty slot 😔 2020-07-31 17:09:54 -04:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
kappa-sama
72cb4fb920 honk 2020-07-28 21:56:39 -04: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
Trilbyspaceclone
b2dd2a1053 Update necropolis_chests.dm 2020-07-07 14:28:40 -04:00
kevinz000
445d94f335 haha whew 2020-06-17 21:32:10 -07:00
Trilbyspaceclone
4e1817d2be why were these tabs? 2020-06-17 03:22:29 -04:00
Trilbyspaceclone
4d9eeae268 Update necropolis_chests.dm 2020-06-17 03:08:52 -04:00
Trilbyspaceclone
51da7dfa71 Merge branch 'master' into spike-loot-differentces 2020-06-17 02:36:52 -04:00
Detective Google
fa5bae14f1 no 100% chance doomsday :^) 2020-06-13 22:14:23 -05:00
TrilbySpaceClone
8b406df1ec mk III 2020-06-05 22:43:49 -04:00
TrilbySpaceClone
b62ef0f4e8 right... 2020-06-02 19:44:47 -04: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