Commit Graph

14810 Commits

Author SHA1 Message Date
kevinz000 a66aad9b70 compile 2020-05-08 23:03:44 -07:00
kevinz000 0f157204eb compile 2020-05-08 23:02:41 -07:00
kevinz000 19072abe37 compile 2020-05-08 23:01:05 -07:00
kevinz000 6d6239a8b4 kay 2020-05-08 22:59:51 -07:00
kevinz000 e684c6e574 ok 2020-05-08 22:40:07 -07:00
kevinz000 4cd5e08902 sigh 2020-05-08 21:27:36 -07:00
kevinz000 d309bc5e74 Instruments no longer keep updating if you aren't holding them etc etc (#12165)
* Update _song.dm

* Update item.dm
2020-05-09 03:15:42 +02:00
Hatterhat 6067370a6f shotgun shell clips (#11955)
* shell clips revised by based ghom

* lmao yeet better not forget that bit

* nitpicking but also merge 11976 first

* No freeloaders.

* Update weapon_designs.dm

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-09 02:49:25 +02:00
Seris02 381333bf82 a (#11873) 2020-05-09 02:15:41 +02:00
kappa-sama cab55f8549 alternate buff (#11867) 2020-05-09 02:14:18 +02:00
Putnam3145 3531459d8b Some trauma rebalancing (#12144)
* Some trauma rebalancing.

* Wow I didn't actually commit the 50% change

* when did i stop compiling before pushing
2020-05-09 01:42:39 +02:00
kevinz000 3a8e9da73b Fixes projectiles going sanic (#12167)
* ok

* woops
2020-05-09 01:27:26 +02:00
Ghommie 88d86e53d0 Porting some radial menu updates, and that one clown mask. 2020-05-09 00:45:48 +02:00
Suicidalpickles 2d9aac8f31 cakehat cat wearing a cakehat while patting a cak (#12166)
fix
2020-05-09 00:40:07 +02:00
kevinz000 1872f556ac woops 2020-05-08 15:09:02 -07:00
kevinz000 afa006d280 ok 2020-05-08 15:02:38 -07:00
Ghommie 2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
Ghommie ffd5dd9615 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit732 2020-05-08 19:01:28 +02:00
Ghommie a412e840f7 'mob_run_block' and 'mob_check_block' macros 2020-05-08 18:52:32 +02:00
Linzolle 24da94720b cold res 2020-05-08 11:51:24 -05:00
Ghommie 90bf157f5e Fixing some runtimes and issues. 2020-05-08 17:17:33 +02:00
kevinz000 77848bd90f tgs folder 2020-05-08 04:30:51 -07:00
Trilbyspaceclone 1472ea31a0 oops all the missing commas 2020-05-08 07:19:03 -04:00
Trilbyspaceclone b5010c5cfc Update machine_vending.dm 2020-05-08 06:49:26 -04:00
Trilbyspaceclone a6bf258f5c Update ice_demon.dm 2020-05-08 04:33:40 -04:00
kevinz000 61692f290a Merge pull request #12121 from Ghommie/Ghommie-cit723
Generic skills support for items, level based skill type. Wiring skill.
2020-05-08 01:24:44 -07:00
kevinz000 43dc1319d9 Merge pull request #12097 from Ghommie/Ghommie-cit720
Implementing the NO_PUBLIC_LATHE build_type flag.
2020-05-07 21:04:57 -07:00
Lin ae3b2a58f9 Merge pull request #12129 from Ghommie/Ghommie-cit726
Fixing some sprite issues and nit-picks.
2020-05-08 03:00:20 +00:00
Ghommie aaa31c24ce Demodularizing a few sprite assets. 2020-05-08 04:02:31 +02:00
kevinz000 51081fcb1a ok (#12083) 2020-05-08 03:36:08 +02:00
Ghommie 192c0dcc1a Demodularizing the arousal module. 2020-05-08 03:35:29 +02:00
Ghommie 60bdbfaf61 Merge conflicts, procs instead of macros, mood signals. 2020-05-08 02:12:41 +02:00
Ghommie 74e7f7ea46 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit726 2020-05-07 22:14:11 +02:00
Ghommie 3914c1bd65 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit727 2020-05-07 21:41:47 +02:00
kevinz000 9c08df761f fixes 2020-05-07 11:50:38 -07:00
kevinz000 05068f80db Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-07 10:57:10 -07:00
kevinz000 ebb6eaa69a a 2020-05-07 09:30:34 -07:00
Ghom a273fc0fed Merge branch 'master' into Ghommie-cit721 2020-05-07 18:18:54 +02:00
kevinz000 7c54da65a2 The great material rebalance (#12123)
* haha bet

* Update stock_parts.dm

* ok
2020-05-07 18:16:14 +02:00
kevinz000 7828c4a5ab Merge pull request #12102 from Ghommie/Ghommie-cit722
Removing cargo "paperwork" and a few other bloat packs.
2020-05-07 09:11:45 -07:00
kevinz000 f642148218 Merge pull request #12126 from Trilbyspaceclone/patch-365
Nerfs combat MK.II hypos
2020-05-07 09:10:16 -07:00
kevinz000 888f0a932f Merge pull request #12124 from Ghommie/Ghommie-cit725
Makes wings/horns colors dna features instead of human variables
2020-05-07 09:10:08 -07:00
kevinz000 73144a4f92 Merge branch 'master' into typing_indicators 2020-05-07 09:04:44 -07:00
kevinz000 f02e8da23a blockdirs 2020-05-07 08:54:21 -07:00
kevinz000 532aba9157 fixes 2020-05-07 08:36:15 -07:00
kevinz000 cb432761d5 Update SDQL_2.dm (#12135) 2020-05-07 14:47:17 +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
kevinz000 1c389abea6 hm 2020-05-07 05:39:17 -07:00
kappa-sama e24bda9a9f this (#12122) 2020-05-07 01:08:48 +02:00
Ghommie a09c7180cb Dims the lights again. 2020-05-06 23:55:36 +02:00