shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,693 Commits 5 Branches 0 Tags
3dfef3c393c1cc83c70fdbca4e013f92fbc70895
Commit Graph

22055 Commits

Author SHA1 Message Date
Ghommie
3dfef3c393 . 2020-05-08 02:50:14 +02:00
Ghommie
4041fce0f7 whops. 2020-05-08 02:30:57 +02:00
Ghommie
ddb50e2845 colors. 2020-05-08 02:24:49 +02:00
Ghommie
835753a02d ! 2020-05-08 02:14:07 +02:00
Ghommie
60bdbfaf61 Merge conflicts, procs instead of macros, mood signals. 2020-05-08 02:12:41 +02:00
kevinz000
2a33060c98 Update world.dm 2020-05-07 10:44:45 -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
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
kappa-sama
e24bda9a9f this (#12122) 2020-05-07 01:08:48 +02:00
Ghom
c97f86ae5a Update mob_movement.dm 2020-05-06 23:36:40 +02:00
kevinz000
5c5fc37959 Introducing noitatsxoB (#12073) 
* okay

* ok

* ok

* ok

* ok

* why am i doing this

* WHY DID I DO THIS

* mirror doesn't work

* compile

* shuttles should work

* fix engine

* fix engine

* off by 1

* ok

* adds proccall to write next map

* haha post processing funny

* fixes

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-06 17:50:50 +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
kevinz000
5e947df0a8 Merge pull request #12114 from Ghommie/Ghommie-cit724 
Fixes felinid's cat ears and removes two unused variables.
 2020-05-06 08:34:03 -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
Putnam3145
ac30079026 Make dust-on-leaving-area code less bad (#12110) 
* Un-badcodes dusts_on_leaving_area.

* var/ not necessary

* Fixed the code to work

* help me
 2020-05-06 17:03:53 +02:00
Trilbyspaceclone
106fb6496e Update hypospray.dm 2020-05-06 05:30:54 -04: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
kevinz000
56fe430a25 ok (#12119) 2020-05-05 23:18:09 +02:00
Lin
32204093b2 Merge pull request #12108 from Putnam3145/replace-pAI-button 
Replaces the pAI candidate button with a ghost roles button
 2020-05-05 20:54:57 +00:00
Ghommie
91d6faaf21 more obligatory changes. 2020-05-05 21:06:53 +02:00
Ghommie
81dde7debd Obligatory. 2020-05-05 21:04:19 +02:00
Ghommie
001109cfcd About ready. 2020-05-05 20:58:44 +02:00
Ghommie
ccfce7cb64 Makes wings/horns colors dna features instead of human defines 2020-05-05 06:22:58 +02:00
kevinz000
f50e661e0a Merge pull request #12106 from Putnam3145/revert-supermatter 
Reverts #10352.
 2020-05-04 21:21:09 -07:00
Ghom
066479da5f mandatory bump to savefile version. 2020-05-05 06:13:17 +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
kevinz000
e26bf5b2af Merge pull request #12115 from Kraseo/the-funny-aheal 
Slow death of Mining PvP: Removes aheals from legion cores
 2020-05-04 20:46:40 -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
Lin
0acec2e56f vendors now accept dollar bills again (#12109) 
* make vendors accept bills

* build

* forgot that function

* this is better

* i thought i had a hook for this
 2020-05-05 05:38:19 +02:00
Ghommie
791b05871f Hey. 2020-05-05 05:24:40 +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
Ghommie
643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +02:00
Lin
367bb0f71c Merge pull request #12072 from Psody-Mordheim/browhatifweusedallthejobslotsduringroundstart 
Lets actually use all the positions
 2020-05-05 00:49:25 +00:00
Lin
e1c97d4261 Merge pull request #12090 from coldud13/radradio 
Radiation collectors now alert engineers when empty
 2020-05-05 00:47:23 +00:00
Lin
c3dfcf1cfe Merge pull request #12104 from timothyteakettle/food-quality-2 
sliced foods have the same quality as the item that was cut
 2020-05-05 00:46:44 +00:00
Kraseo
f760919108 actually makes your speed reset to normal once the status is gone rather then when you get hit again 2020-05-04 21:06:15 +02:00
Kraseo
3cf7fd5105 pleases the travis god 2020-05-04 18:47:57 +02:00
Kraseo
c79ece7449 really surprised this wasn't done earlier 2020-05-04 18:30:27 +02:00