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

810 Commits

Author SHA1 Message Date
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
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
Seris02 68f15e16e7 fixed 2020-02-22 20:06:35 +08:00
Seris02 c3ec44b0d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-02-22 19:54:10 +08:00
Seris02 84d08fe122 firebreath change + update to tg genetics + calc patch 2020-02-22 19:42:33 +08:00
kevinz000 f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
Detective Google ca29246878 adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.) 2020-02-22 00:02:49 -06:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000 a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00
necromanceranne af6df2784c holy shit this was still in the fucking game 2020-02-20 04:46:30 +11:00
kevinz000 0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
kevinz000 7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569 
Something about the in operator and spaceDMM version update.
 2020-02-15 12:17:37 -07:00
Seris02 2d9c8ce8fc fixing merge conflicts 2020-02-15 15:41:52 +08:00
Ghom 1e57664a99 Merge pull request #10934 from kevinz000/actual_ghost_newscasters 
Ok that last merge was a complete mistake so I kind of redid the feature myself (book/newscaster ghost reading)
 2020-02-14 19:21:48 +01:00
kevinz000 d74cfb7734 Update compressionkit.dm 2020-02-13 02:22:25 -07:00
kevinz000 eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
kevinz000 40111faab1 Update geiger_counter.dm 2020-02-13 00:12:25 -07:00