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

14493 Commits

Author SHA1 Message Date
kevinz000
c2e689aec0 i'm salty (#12181) 2020-05-10 21:33:56 +02:00
Lin
dd7db603d2 Merge pull request #12159 from Ghommie/Ghommie-cit732 
'mob_run_block' and 'mob_check_block' macros
 2020-05-10 18:25:16 +00:00
kevinz000
05cede4e4d fixes xenomorphs not being in combat mode (#12193) 
* ok

* Update combat.dm
 2020-05-10 17:38:07 +02:00
Lin
e7fedd7d12 Merge pull request #12148 from Trilbyspaceclone/patch-369 
Adds Ice hiking boots to miner venders
 2020-05-10 05:36:38 +00:00
kevinz000
f7808e97ad fix (#12188) 2020-05-10 02:58:58 +02:00
kiwedespars
a6ad4dc9bf changeling rebalance. (#12134) 
* Update fleshmend.dm

* Update shriek.dm

* Update mutations.dm

* makes aug-eyes into actual thermals.

* removing regen jelly and mannitol from adrenals

* Update strained_muscles.dm

* Update chameleon_skin.dm

* Update biodegrade.dm

* Update fleshmend.dm

whoops, forgot to add the loudness text.

* Update fleshmend.dm

why do i keep doing this.

* holy shit i'm tired.

* Update code/modules/antagonists/changeling/powers/augmented_eyesight.dm

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

* Update augmented_eyesight.dm

* Update augmented_eyesight.dm

* Update augmented_eyesight.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-09 14:38:18 +02:00
Putnam3145
c20c7f0698 Removes crocin, hexacrocin from emagged booze dispenser; makes crocin no longer "roofies" (??) (#12177) 
* Removes crocin, hexacrocin from emagged booze dispenser

* what. what. what. what. what.
 2020-05-09 14:34:30 +02:00
kevinz000
cdfdaac82e ok (#12161) 2020-05-09 14:21:27 +02:00
kevinz000
1981b6b3c7 Merge pull request #12130 from Ghommie/Ghommie-cit727 
Dims the lights, again.
 2020-05-08 23:30:19 -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
5a716bfcfd Merge pull request #12143 from Ghommie/Ghommie-cit729 
Demodularizing a few sprite assets.
 2020-05-08 23:29:34 -07:00
kevinz000
cfcac55654 Merge pull request #12142 from Ghommie/Ghommie-cit728 
Demodularizing the arousal module.
 2020-05-08 23:29:16 -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
Suicidalpickles
2d9aac8f31 cakehat cat wearing a cakehat while patting a cak (#12166) 
fix
 2020-05-09 00:40:07 +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
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
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
Ghommie
a09c7180cb Dims the lights again. 2020-05-06 23:55:36 +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
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