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

825 Commits

Author SHA1 Message Date
kevinz000
afbbde610a Merge pull request #12201 from Ghommie/Ghommie-cit740 
Purging unused dogborg items.
 2020-05-12 12:27:26 -07:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Ghommie
e0b91c53af Purging unused dogborg items. 2020-05-10 22:17:05 +02: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
b2a20d5438 reducing some prices as training wheel. 2020-05-03 05:37:04 +02:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
kevinz000
fe938c500e Merge pull request #12079 from Ghommie/Ghommie-cit715 
Fixing several reported issues.
 2020-05-02 15:54:32 -07:00
Ghommie
a1f252d558 Fixing several reported issues. 2020-05-01 19:48:27 +02:00
kevinz000
2e35a42f43 wow lotsa effort huh 2020-04-26 04:10:38 -07:00
kevinz000
af3651172c wow lotsa effort huh 2020-04-26 03:29:31 -07:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghommie
c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
Putnam
33039f9962 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vore-optimization 2020-04-17 18:56:26 -07:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Putnam
1e8fffbf0b Replaced all the extraneous flags with bitflags 2020-04-13 16:47:43 -07:00
kevinz000
8604297dcd Merge pull request #11811 from Ghommie/Ghommie-cit671 
Fixes and standarizes a few liver troubles. Re-enables liver failure.
 2020-04-12 17:01:50 -07:00
kevinz000
d60932ca5d Merge pull request #11697 from Ghommie/Ghommie-cit655 
Ports "Obliterates item_color: new washing machine functionality edition"
 2020-04-12 16:16:37 -07:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Ghommie
af55880794 Fixes and standarizes a few liver troubles. Re-enables liver failure. 2020-04-10 17:22:34 +02:00
Ghommie
7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
TrilbySpaceClone
e9d2e798a3 more glasswork 2020-04-07 17:58:23 -04:00
kevinz000
8b2132317b Ports a rewritten version of BAYSTRUMENTS (#11680) 
* bay instruments

* k

* AAA

* remove that

* changes

* Update _instrument_key.dm

* safety nets

* @ghommie fixed

* volume

* Update item.dm

* Update item.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-07 15:21:50 +02:00
Putnam
443af96126 Changed how scanners show organ damage. 2020-04-05 03:25:04 -07:00
Ghommie
c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
Ghommie
41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Trilbyspaceclone
8bd238c87c Reblances flares, flashlights and eye-lights (#11404) 
* Update flashlight.dm

* makes the torch be enlightend

* Update flashlight.dm

* Update code/game/objects/items/devices/flashlight.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* >makes atmo pipes small items >makes heavy duty flashlight lightweight > muh realism

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-26 16:49:49 +01:00
Putnam3145
ab1274c832 Massive optimization for sink objective. (#11563) 2020-03-22 13:01:36 +01:00
Seris02
ea8941343e stops validhunting geneticists from knowing exactly who is an is a vampire (and allows vampires genes) (#11520) 
* yeet gone

* pfft oof

* oof
 2020-03-19 13:40:11 +01:00
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics 
ports tg genetics
 2020-03-11 17:01:37 -07:00
Putnam3145
480eb32c68 Merge pull request #11418 from Ghommie/Ghommie-cit615 
Fix runtimes some more.
 2020-03-11 17:01:13 -07:00
Ghommie
27a7f754c4 Fix runtimes some more. 2020-03-10 22:40:06 +01:00
Seris02
cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
Ghom
f8c18fe5a8 Update PDA.dm 2020-03-09 00:52:11 +01:00
kevinz000
2b99f729e6 Merge pull request #11384 from Citadel-Station-13/Ghommie-patch-3 
I forgot to delete a line on the (now working) PDA overlays fix.
 2020-03-08 11:09:17 -07:00
kevinz000
c736568a5a Merge pull request #11369 from Ghommie/Ghommie-cit609 
Porting the musician and curator beacons.
 2020-03-08 07:34:48 -07:00
Ghom
d25ec08da8 Update PDA.dm 2020-03-08 07:13:08 +01:00
Ghommie
a817bd6115 Porting the musician and curator beacons. 2020-03-07 00:12:50 +01:00
kevinz000
0a68143a3e Merge pull request #11297 from Ghommie/Ghommie-cit597 
some dozens lines about some update_overlays issues and cryopods/MMIs.
 2020-03-06 00:20:54 -07:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
kevinz000
c21bd60929 fix 2020-03-03 03:04:23 -07:00
Ghommie
efaa99ae27 some dozens lines about PDA/update_overlays and cryopods/MMIs. 2020-03-01 23:17:35 +01:00
kevinz000
56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
Ghommie
fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
kevinz000
bfb8139225 DefaultCombatknockdown 2020-02-25 03:18:37 -07:00
kevinz000
ae6c388510 Merge pull request #11214 from Citadel-Station-13/Ghommie-patch-3 
Fixing pAI radios inability to be toggled on/off
 2020-02-24 02:23:30 -07:00
kevinz000
73c03adbbb Merge pull request #11199 from Detective-Google/pai.pai.pai.png 
Lets pAIs hold encryption keys and play music.
 2020-02-24 02:23:17 -07:00
Ghom
825beb41c1 Update paicard.dm 2020-02-23 22:44:38 +01:00
Ghom
b3149d930f Fixing pAI radios inability to be toggled on/off 2020-02-23 21:31:53 +01:00