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

3890 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
fcb907d2ce Merge pull request #2872 from Citadel-Station-13/upstream-merge-30802 
[MIRROR] Stamina regen light
 2017-09-21 07:36:45 -04:00
LetterJay
36cdee9f1c Merge pull request #2871 from Citadel-Station-13/upstream-merge-30848 
[MIRROR] VV Href Fixes
 2017-09-21 07:35:24 -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
3f7110d339 Merge pull request #2882 from deathride58/arousalruntimefix 
Fixes a runtime in mind.dm
 2017-09-21 07:32:23 -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
LetterJay
7c3845b779 Merge pull request #2870 from Citadel-Station-13/upstream-merge-30876 
[MIRROR] Traitorbro fixes
 2017-09-21 07:31:07 -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
LetterJay
5b38d23bfd oops 2017-09-21 02:28:37 -05:00
deathride58
0d653c9f44 im unrobust 2017-09-20 22:39:58 -04:00
deathride58
860fe663b5 axes runtime's unstoppable horniness 2017-09-20 22:20:44 -04: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
LetterJay
bb837fe20e donation item 2017-09-20 04:57:57 -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
oranges
51b8f45345 Merge pull request #30802 from CPTANT/Stamina_regen_2 
Stamina regen light
 2017-09-20 03:52:59 -05:00
oranges
ef867206bb Merge pull request #30848 from tgstation/Cyberboss-patch-2 
VV Href Fixes
 2017-09-20 03:50:47 -05:00
pubby
dae93856f5 Traitorbro fixes 2017-09-20 03:48:33 -05:00
CitadelStationBot
accd92a676 [MIRROR] Fixes mode conversion runtime (#2855) 
* Fixes mode conversion runtime (#30857)

* Fixes mode conversion runtime
 2017-09-20 01:40:52 -05:00
Poojawa
6d717995a4 Update meteors.dm (#2867) 2017-09-20 01:40:09 -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
6e79861679 [MIRROR] fix black box runtimes (#2863) 
* fix black box runtimes

* fix black box runtimes
 2017-09-20 01:03:17 -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
50e9dd17b6 Merge pull request #2801 from Citadel-Station-13/upstream-merge-30745 
[MIRROR] Dice will now roll when thrown
 2017-09-19 12:20:34 -04:00
LetterJay
5f759c7c3f Merge pull request #2858 from Citadel-Station-13/upstream-merge-30859 
[MIRROR] Fixes safes not having adjacency checks
 2017-09-19 12:19:59 -04:00
LetterJay
e410b452ea Merge pull request #2817 from Michiyamenotehifunana/master 
Adds Anti Tank pistols
 2017-09-19 12:15:01 -04:00
kevinz000
7c0e17236d Fixes safes not having adjacency checks (#30859) 
* Update safe.dm

* Update safe.dm
 2017-09-19 10:56:51 -05: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
ecce4cf138 [MIRROR] New DCS signals (#2741) 
* New DCS signals

* Update atoms.dm

* actually ports comsigs
 2017-09-19 07:00:08 -05:00
CitadelStationBot
628a2442e2 [MIRROR] Slightly remaps and adds more supplies to the animal hospital ruin (#2705) 
* Merge pull request #30505 from Xhuis/vet_remap

Slightly remaps and adds more supplies to the animal hospital ruin

* Slightly remaps and adds more supplies to the animal hospital ruin
 2017-09-19 06:37:56 -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
Poojawa
b6fdbb54f5 Update dice.dm 2017-09-19 06:35:36 -05:00
CitadelStationBot
170f5d7a5e [MIRROR] Log file for PDA messages (#2848) 
* log file for pda messaegs (#30827)

* Log file for PDA messages
 2017-09-19 06:34:53 -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