Commit Graph

6028 Commits

Author SHA1 Message Date
kevinz000 05cede4e4d fixes xenomorphs not being in combat mode (#12193)
* ok

* Update combat.dm
2020-05-10 17:38:07 +02:00
Ghommie 6666c651d5 Fixing IPCs and synth lizard antennas not showing up. 2020-05-10 03:06:39 +02:00
kevinz000 6993aa20ce ok 2020-05-09 09:18:57 -07:00
kevinz000 407b1c7447 Merge remote-tracking branch 'citadel/master' into projectiles_2 2020-05-08 23:32:01 -07:00
kevinz000 dcdda5451e Merge pull request #12146 from Trilbyspaceclone/patch-368
slows down ice demons
2020-05-08 23:29:50 -07:00
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 e684c6e574 ok 2020-05-08 22:40:07 -07:00
Seris02 381333bf82 a (#11873) 2020-05-09 02:15:41 +02:00
Ghommie 88d86e53d0 Porting some radial menu updates, and that one clown mask. 2020-05-09 00:45:48 +02: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
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
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
kevinz000 51081fcb1a ok (#12083) 2020-05-08 03:36:08 +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
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 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
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
Ghom c97f86ae5a Update mob_movement.dm 2020-05-06 23:36:40 +02:00
Ghommie b5a4bceafb Fixing some sprite issues and nit-picks. 2020-05-06 17:46:15 +02:00
kevinz000 3397c2284a Merge pull request #12128 from Citadel-Station-13/Ghommie-patch-1
Webedit PR fixing a few sprite accessories.
2020-05-06 08:35:08 -07:00
Ghom 13eeffbf27 Update wings.dm 2020-05-06 17:19:52 +02:00
Ghom d13ed03861 Update tails.dm 2020-05-06 17:18:03 +02:00
Ghom 9c31a89fde Update spines.dm 2020-05-06 17:15:50 +02:00
Ghom 7477878062 Update snouts.dm 2020-05-06 17:12:15 +02:00
kevinz000 f034c7c536 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-05 17:38:43 -07:00
kevinz000 3a843f6da4 a 2020-05-05 17:06:07 -07:00
Ghom 94d67ab640 Update mob_movement.dm 2020-05-06 01:15:30 +02:00
Ghommie e9ccc3ac62 Test and update. 2020-05-06 01:03:54 +02:00
Ghom b36e44d983 Merge branch 'master' into Ghommie-cit724 2020-05-05 23:32:51 +02:00
Ghommie 001109cfcd About ready. 2020-05-05 20:58:44 +02:00
kevinz000 4327d8eb87 why did i design this way why why why 2020-05-05 04:32:35 -07:00
Ghommie ccfce7cb64 Makes wings/horns colors dna features instead of human defines 2020-05-05 06:22:58 +02:00
kevinz000 395e3e41cc Merge pull request #11874 from Ghommie/Ghommie-cit682
General taur visuals refactor and other things.
2020-05-04 20:52:33 -07:00
Ghommie 3de0e545c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-05 05:44:55 +02:00
Ghommie f770586407 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit723 2020-05-05 05:09:29 +02:00
Ghommie c34655d094 Uh uh. 2020-05-05 04:48:49 +02:00
Ghommie 0adca2d9b8 Oh. 2020-05-05 04:45:43 +02:00