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

3834 Commits

Author SHA1 Message Date
CitadelStationBot
1edd7b82d1 [MIRROR] Minor weather code split/refactor (#2837) 
* Minor weather code split/refactor

* Delete weather_types.dm

* Update radiation_storm.dm
 2017-09-18 01:46:41 -05:00
CitadelStationBot
d4a577014a [MIRROR] Fixes esaw icon (#2831) 
* Fixes esaw icon

* Update energy.dm
 2017-09-18 01:46:20 -05:00
CitadelStationBot
d8a1fc936e [MIRROR] Stops AIs from taking actions while depowered (#2813) 
* Stops AIs from taking actions while depowered

* Update ai.dm
 2017-09-18 01:45:59 -05:00
CitadelStationBot
4bc6e9d522 [MIRROR] Cleaned up some decimal values. (#2797) 
* Cleaned up some decimal values.

* Update gas_mixture.dm

* Update color.dm

* Update medsci.dm
 2017-09-18 01:45:39 -05:00
CitadelStationBot
83ec9b6d26 [MIRROR] Cleans up showcase & plaque varedits, updated loyalty implant references (#2768) 
* Cleans up showcase & plaque varedits, updated loyalty implant references (#30698)

* Cleans up showcase varedits

* drop_location for oldpods

* Plaques + more loyalty implant references

* Cleans up showcase & plaque varedits, updated loyalty implant references
 2017-09-17 23:07:05 -05:00
Poojawa
7bfa8b1a9a Changes Hulk allowed species to fly from 'oomie (#2819) 
Changes Hulk allowed species and fixes SE issues
 2017-09-17 23:06:23 -05:00
CitadelStationBot
680e9e9697 [MIRROR] Quick pAI software buying tweak (#2825) 
* Added the thing that Cruix wanted

* Quick pAI software buying tweak

* Update software.dm
 2017-09-17 22:59:33 -05:00
CitadelStationBot
7299854f8b [MIRROR] Puts the computer circuit board back in nullspace where it supposedly belongs (#2810) 
* Puts the computer circuit board back in nullspace where it supposedly belongs

* Update _computer.dm
 2017-09-17 22:55:04 -05:00
CitadelStationBot
e2e85e9294 [MIRROR] Window Spawner Refactor (#2815) 
* Window spawner refactor (#30747)

* Window Spawner Refactor
 2017-09-17 22:42:22 -05:00
CitadelStationBot
201cb984c8 [MIRROR] Fix ingredient box icon (again) (#2823) 
* Fix ingredient boxes

* Fix ingredient box icon (again)
 2017-09-17 22:36:21 -05:00
CitadelStationBot
4dd0dc9d66 [MIRROR] Various grammar fixes (#2842) 
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
 2017-09-17 22:35:51 -05:00
CitadelStationBot
b13f090fe9 [MIRROR] Adds Lavaland items to weapon exports for cargo (#2836) 
* Adds Lavaland items to weapon exports for cargo (#30403)

They're expensive, but those mobs are quite difficult to kill

* Adds Lavaland items to weapon exports for cargo
 2017-09-17 22:32:53 -05:00
CitadelStationBot
99e0463261 [MIRROR] Fixes bluespace golem teleport icon (#2834) 
* Fixes bluespace golem teleport icon

* Fixes bluespace golem teleport icon
 2017-09-17 22:31:55 -05:00
CitadelStationBot
c8b153ee71 [MIRROR] Varedit cleanup mk4 (#2833) 
* Varedit cleanup mk4 (#30794)

* Cleans up and corrects a bunch of varedits

* Plant varedits

* More layers

* Adjusted plant name/description

* Varedit cleanup mk4
 2017-09-17 22:31:30 -05:00
CitadelStationBot
76085457d6 [MIRROR] Fix maple shotgun icon_state (#2829) 
* Fix maple shotgun icon_state (#30796)

* Fix maple shotgun icon_state
 2017-09-17 22:26:50 -05:00
CitadelStationBot
8846708727 [MIRROR] Fixes cyborg airlock interaction (#2827) 
* Fixes cyborg airlock interaction (#30809)

* changes the sheet check to respect cyborgs

* Uses the proc instead of a hack that we wound need to fix again

* I can code totaly, yeah, sober...

* I cant posibly be drunk yet i only GOT the wine a minute ago

* Fixes cyborg airlock interaction
 2017-09-17 22:25:59 -05:00
CitadelStationBot
9284bdd205 [MIRROR] Admins in chat are notified if an ahelp is answered in game (#2828) 
* Admins in chat are notified if an ahelp is answered in game (#30638)

* Admins in chat are notified if an ahelp is answered in game

* Further sanity

* Admins in chat are notified if an ahelp is answered in game
 2017-09-17 22:25:43 -05:00
CitadelStationBot
656b9c2810 [MIRROR] Fixes remaining dummy delete runtime. (#2824) 
* Fixes remaining dummy delete runtime.

* Fixes remaining dummy delete runtime.
 2017-09-17 22:23:43 -05:00
CitadelStationBot
b1ba49f37e [MIRROR] Blobbernauts are healed quicker by cores and nodes (#2821) 
* Blobbernauts are healed quicker by cores and nodes (#30527)

* Blobbernauts are healed quicker by cores and nodes

i hate sitting for 3-5 minutes waiting to heal as a naut

* no you can't heal without a factory

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Blobbernauts are healed quicker by cores and nodes
 2017-09-17 22:23:08 -05:00
CitadelStationBot
d0c9f79a37 [MIRROR] Makes building with plasma glass a thing. (#2820) 
* Makes building with plasma glass a thing. (#30800)

* Makes building with plasma glass a thing.

* Updated grille.dm

* Makes building with plasma glass a thing.
 2017-09-17 22:22:50 -05:00
CitadelStationBot
29a2309f70 [MIRROR] Fixes the issue of potted plants not having their overlays when picked up/equipped. (#2822) 
* Fixes the issue of potted plants not having their overlays when picked up/equipped.

* Fixes the issue of potted plants not having their overlays when picked up/equipped.
 2017-09-17 22:20:58 -05:00
CitadelStationBot
a94a8f9ab4 [MIRROR] Enables Dead OOC at round-end (#2835) 
* Enables Dead OOC at round-end (#30716)

* Enables Dead OOC at roundend

* proc

* proc #2

* Enables Dead OOC at round-end
 2017-09-17 22:20:15 -05:00
CitadelStationBot
53421365f1 [MIRROR] Adds some new drink functions, buffs Brave Bull (#2838) 
* Adds some new drink functions, buffs Brave Bull (#30521)

* Adds some new drink functions, buffs Brave Bull

* Light holder object

* Cleans Tequila Sunrise if its light object is eaten

* QDEL_NULL

* Health clamp

* Adds some new drink functions, buffs Brave Bull
 2017-09-17 22:19:35 -05:00
CitadelStationBot
b08ec542e7 [MIRROR] Minor tweaks to an if (#2839) 
* Minor tweaks to an if (#30683)

* Minor tweaks to an if

* Whoops

* Minor tweaks to an if
 2017-09-17 22:16:31 -05:00
CitadelStationBot
9b08d9d5c9 [MIRROR] Fixes the magic ladder (#2843) 
* Fixes the magic ladder

* Update necropolis_chests.dm
 2017-09-17 22:16:04 -05:00
CitadelStationBot
55294bfb2a [MIRROR] Fixes blackbox artifact exploits (#2845) 
* Fixes blackbox artifact exploits

* Update colossus.dm

* Update colossus.dm
 2017-09-17 22:15:45 -05:00
CitadelStationBot
1d1badde40 [MIRROR] Fixes chemfridges not displaying items with dots in their name properly (#2844) 
* Fixes chemfridges not displaying items with dots in their name properly

* Fixes chemfridges not displaying items with dots in their name properly
 2017-09-17 22:15:22 -05:00
CitadelStationBot
597c02135a [MIRROR] Maybe fix shuttle issues (#2841) 
* Merge pull request #30819 from MrStonedOne/patch-425

Maybe fix shuttle issues

* Maybe fix shuttle issues
 2017-09-17 21:35:42 -05:00
deathride58
252d8619da nerfs runtime's nudity 2017-09-17 21:09:29 -04:00
CitadelStationBot
b09aa9d082 [MIRROR] Fixes stacking when crafting items (#2814) 
* Merge pull request #30746 from YPOQ/stackfix

Fixes stacking when crafting items

* Fixes stacking when crafting items
 2017-09-17 12:03:31 -05:00
CitadelStationBot
ada383e629 [MIRROR] Clarifies the egyptian staff desc (#2811) 
* Clarifies the egyptian staff desc (#30765)

* Clarifies the egyptia staff desc

* I can't write

* Clarifies the egyptian staff desc
 2017-09-17 12:03:12 -05:00
CitadelStationBot
3c8f4ca032 [MIRROR] Monkeys are now more likely to become Gorillas (#2806) 
* Monkeys are now more likely to become Gorillas (#30775)

* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Monkey to Gorilla now more likely

* Monkeys are now more likely to become Gorillas
 2017-09-17 12:02:23 -05:00
CitadelStationBot
3a7640d436 [MIRROR] Fixes random gamemode instantiation (#2803) 
* Fixes random gamemode instantiation

* Fixes random gamemode instantiation
 2017-09-17 12:01:33 -05:00
CitadelStationBot
69c1d74f65 [MIRROR] Corrects killroom turf gas mixture (#2805) 
* Corrects killroom turf gas mixture

* Corrects killroom turf gas mixture
 2017-09-17 12:00:59 -05:00
CitadelStationBot
acc2104068 [MIRROR] Adds href token to station name rejection (#2798) 
* Adds href token to station name rejection (#30740)

* Adds href token to station name rejection

* Update charter.dm

* Adds href token to station name rejection
 2017-09-17 12:00:39 -05:00
CitadelStationBot
768c90fc03 [MIRROR] Removes vine floors and their sprite (#2807) 
* Removes vine floors and their sprite (#30778)

* removes vine floors and their sprite

* Once more, with feeling

* Revert "Merge branch 'kudzufix' of https://github.com/vuonojenmustaturska/tgstation into kudzufix"

This reverts commit 89d99caa75dcadabebdf44a6e4b6c40b2914156a, reversing
changes made to 92e89ed02b767b927a83ee3a878b6eb38f590c5c.

* Removes vine floors and their sprite
 2017-09-17 12:00:19 -05:00
CitadelStationBot
08083581c3 [MIRROR] (Hopefully) Lessens preferences and manifest injection lag (#2796) 
* (Hopefully) Lessens preferences and manifest injection lag

* Update datacore.dm

* Update preferences_setup.dm
 2017-09-17 11:59:40 -05:00
CitadelStationBot
cbfee7e313 [MIRROR] Tank gauge rounding fix (#2800) 
* Merge pull request #30749 from ShizCalev/tank-display-fix

Tank gauge rounding fix

* Tank gauge rounding fix
 2017-09-17 11:58:50 -05:00
CitadelStationBot
1cca85a58e [MIRROR] Fixes null modes being picked (#2802) 
* Fixes null modes being picked

* Fixes null modes being picked
 2017-09-17 11:58:33 -05:00
CitadelStationBot
d96f3f40a5 [MIRROR] PDA game log entry contains ckey (#2808) 
* PDA game log entry contains ckey

* PDA game log entry contains ckey
 2017-09-17 11:58:11 -05:00
Poojawa
dd4f68dfee Cleans up .rej spam and the empty file from #2792 (#2818) 
* Cleans up .rej spam and the empty file from #2792

* Update tgstation.dme
 2017-09-17 11:56:55 -05:00
LetterJay
d0a4eb0808 Merge pull request #2790 from Citadel-Station-13/upstream-merge-30727 
[MIRROR] Fixes ReportDeath runtime
 2017-09-17 08:56:07 -05:00
LetterJay
4312b93ad2 Merge pull request #2702 from Citadel-Station-13/upstream-merge-30548 
[MIRROR] Magic Ladder
 2017-09-17 08:55:41 -05:00
Poojawa
7cf4d0797b Applies WRITE_FILE to Citadel saves + Belly clone fix (#2694) 
* Applies WRITE_FILE to everything

* Maybe this works, actually

* HAHAH I FIXED IT FUCKOS
 2017-09-17 02:26:27 -05:00
CitadelStationBot
a9d42c9051 [MIRROR] Fix clothing crafting menu for realsies this time (#2812) 
* Fix clothing crafting menu for realsies (#30776)

* Fix clothing crafting menu for realsies this time
 2017-09-16 20:25:42 -05:00
Poojawa
ad7c927208 Update mutations.dm 2017-09-16 10:44:22 -05:00
Poojawa
71719f6787 Update _computer.dm 2017-09-16 09:19:47 -05:00
Poojawa
15db46af10 Update dogborgstuff.dm 
removes PAI from protected, add bomb cores. christ people are memes.
 2017-09-16 08:22:50 -05:00
CitadelStationBot
d2db21dbdf [MIRROR] Ninja adrenaline boost removes stamina damage (#2783) 
* Merge pull request #30704 from YPOQ/boost

Ninja adrenaline boost removes stamina damage

* Ninja adrenaline boost removes stamina damage
 2017-09-16 04:46:41 -05:00
Poojawa
29c116f491 disables genetics-aquireable hulk until nerfed 2017-09-16 04:43:54 -05:00