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

2318 Commits

Author SHA1 Message Date
CitadelStationBot
fd64d4fdfa [MIRROR] Fixes IRC ahelp answer notifications (#2888) 
* Merge pull request #30912 from tgstation/Cyberboss-patch-4

Fixes IRC ahelp answer notifications

* Fixes IRC ahelp answer notifications
 2017-09-22 04:45:24 -05:00
LetterJay
8c6c57ff32 Merge pull request #2885 from Citadel-Station-13/upstream-merge-30896 
[MIRROR] Removes old debug text
 2017-09-22 00:03:30 -04:00
Poojawa
b7739d1c77 Update hostile.dm 2017-09-21 15:40:04 -05:00
LetterJay
dd7189618f Merge pull request #2873 from Citadel-Station-13/upstream-merge-30768 
[MIRROR] Adds back required arrivals undockedness with a config
 2017-09-21 07:37:04 -04:00
LetterJay
e154c27a72 Update circulator.dm 2017-09-21 06:35:01 -05:00
LetterJay
c1a3dc1c1e Update cameranet.dm 2017-09-21 06:33:36 -05:00
LetterJay
afa1ef069c Merge pull request #2884 from Citadel-Station-13/upstream-merge-30891 
[MIRROR] Fixes banning panel href errors, adds href helper functions
 2017-09-21 07:32:42 -04:00
LetterJay
e05b24483c Merge pull request #2879 from Citadel-Station-13/upstream-merge-30871 
[MIRROR] Fix: No more beating sounds from dead hearts
 2017-09-21 07:32:04 -04:00
LetterJay
ee7f3f748f Merge pull request #2877 from Citadel-Station-13/upstream-merge-30841 
[MIRROR] Buffs Magillitis
 2017-09-21 07:31:44 -04:00
oranges
41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
Poojawa
aec48daa0a Ashdrake noms (#2868) 
* Initial commit

* probably a better way to check this

* It compiled boys. Let's see if it works.

* IT WAS ALL NULLS, BOYS

* Hooray, it's not broken anymore boys!

* Well it works, but we need transfer IDs to work

locating them post-initialize would help, probably. Then assigning their
links soon after.

* Bellies linked, autotransfer, LoseTarget

* half-thought sanity check needs to go away

* A few last minute tweaks.
 2017-09-21 06:29:08 -05:00
oranges
9788c425be Merge pull request #30891 from vuonojenmustaturska/adminhref 
Fixes banning panel href errors, adds href helper functions
 2017-09-21 06:28:55 -05:00
Robustin
e9534fb156 Fix: No more beating sounds from dead hearts (#30871) 
* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Removes beating from nonbeating hearts

* single check
 2017-09-20 10:58:55 -05:00
ShizCalev
f5f9ada39c Makes magillitis affect all Hominidae. (#30841) 2017-09-20 09:06:02 -05:00
oranges
9ee60af5e8 Merge pull request #30768 from Cyberboss/BringingSexyBack 
Adds back required arrivals undockedness with a config
 2017-09-20 03:55:14 -05:00
Poojawa
5b6be1bc44 wew, memes. (#2869) 2017-09-20 01:39:46 -05:00
CitadelStationBot
51786b346e [MIRROR] Fixes it so Deadmin properly hides the Player Panel verb for admins. (#2861) 
* Fixes it so Deadmin properly hides the Player Panel verb for admins.

* Update admin_verbs.dm
 2017-09-20 01:04:13 -05:00
CitadelStationBot
84f108a68b [MIRROR] Fix pipenets (#2860) 
* Fix pipenets

* Fix pipenets
 2017-09-20 01:02:33 -05:00
Poojawa
4ab7f126ed Vore system updates (#2864) 
* Tasting, digest/transfer chance, improvements

* more vague for defaults

* Actually let's hold off on silenced mode 'cuz broke

* make sure it's all commented out

* reverts vorepanel updater, buggy af. Adds mob vore

Ian can eat you now. \o/
 2017-09-19 14:03:13 -05:00
LetterJay
b4e6519b51 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-09-19 12:32:31 -05:00
LetterJay
7c626edca4 fk u 2017-09-19 12:32:10 -05:00
LetterJay
e410b452ea Merge pull request #2817 from Michiyamenotehifunana/master 
Adds Anti Tank pistols
 2017-09-19 12:15:01 -04:00
LetterJay
51007614e6 sql fix 2017-09-19 09:24:43 -05:00
CitadelStationBot
fd2e1c896f [MIRROR] Fixes incorp move runtimes on border movement. (#2774) 
* Fixes incorp move runtimes on border movement.

* Update mob_movement.dm

* Update mob_movement.dm
 2017-09-19 07:00:54 -05:00
CitadelStationBot
3afe490be3 [MIRROR] Fixes bees attacking apiaries (#2772) 
* Fixes bees attacking apiaries

* Update bees.dm
 2017-09-19 06:37:30 -05:00
CitadelStationBot
e1aa96ad64 [MIRROR] Remove unused check_pressure proc (#2852) 
* Remove unused check_pressure proc (#30853)

* Remove unused check_pressure proc
 2017-09-19 06:24:47 -05:00
CitadelStationBot
9c9020ec32 [MIRROR] Removes dead testing code (#2854) 
* Merge pull request #30860 from ninjanomnom/quickfix

Removes dead testing code

* Removes dead testing code
 2017-09-19 06:24:12 -05:00
Michiyamenotehifunana
1f84944dee Anti Tank Pistol Improvements and Implementation 
Fixes the issues with the ATP, modifies its sprite slightly, and adds it to the nukeops uplink list.
 2017-09-18 23:11:14 +08:00
LetterJay
19309d76d0 Merge pull request #2840 from Citadel-Station-13/upstream-merge-30344 
[MIRROR] Traitorbro gamemode
 2017-09-18 08:35:00 -04: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
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
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
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
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
deathride58
252d8619da nerfs runtime's nudity 2017-09-17 21:09:29 -04:00
pubby
a01f3213f5 Traitorbro gamemode 2017-09-17 18: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
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
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