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

7741 Commits

Author SHA1 Message Date
deathride58
a7ec44bfcc Merge pull request #4773 from Citadel-Station-13/upstream-merge-34298 
[MIRROR] Adds logging and feedback messages to organ manipulations by admins
 2018-01-12 17:42:24 +00:00
deathride58
ed3779feff Merge pull request #4772 from Citadel-Station-13/upstream-merge-34336 
[MIRROR] Fixes forensics runtimes
 2018-01-12 17:42:05 +00:00
deathride58
a2fb8b5304 Merge pull request #4765 from Citadel-Station-13/upstream-merge-34117 
[MIRROR] Makes medbots unable to inject you if you are are fully covered with THICKMATERIAL.
 2018-01-12 17:41:44 +00:00
deathride58
0c56db4f9b Merge pull request #4764 from Citadel-Station-13/upstream-merge-34090 
[MIRROR] Replace hardcoded z-level numbers with a trait system
 2018-01-12 17:41:28 +00:00
kevinz000
5920ec6996 Adds logging and feedback messages to organ manipulations by admins (#34298) 
* logging

* Update manipulate_organs.dm
 2018-01-11 21:23:21 -06:00
kevinz000
f234c471ee Fixes forensics runtimes (#34336) 2018-01-11 21:11:58 -06:00
LetterJay
2b9b826a95 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2018-01-11 20:38:06 -06:00
LetterJay
946d0243ce donation item fix 2018-01-11 20:37:54 -06:00
deathride58
eedf8eb101 Update cit_objectives.dm 2018-01-11 20:19:09 -05:00
deathride58
048a321f72 Merge pull request #4753 from Citadel-Station-13/upstream-merge-34290 
[MIRROR] Fixes configuration not loading
 2018-01-12 00:42:01 +00:00
deathride58
c0f78415a5 Merge pull request #4771 from Citadel-Station-13/upstream-merge-34270 
[MIRROR] Fixes toolarm grammar
 2018-01-12 00:41:32 +00:00
deathride58
850097abbd Merge pull request #4770 from Citadel-Station-13/upstream-merge-34282 
[MIRROR] Fix hitting closets with wrenches
 2018-01-12 00:41:19 +00:00
deathride58
361e53be3f Merge pull request #4769 from Citadel-Station-13/upstream-merge-34329 
[MIRROR] Fixes mind transfers
 2018-01-12 00:40:56 +00:00
deathride58
d9e8f595b8 Merge pull request #4767 from Citadel-Station-13/upstream-merge-34146 
[MIRROR] Fixes vehicle action handling ordering
 2018-01-12 00:40:43 +00:00
deathride58
15f0b623ba Update cit_objectives.dm 2018-01-11 19:40:19 -05:00
Leo
0985450524 Merge pull request #34270 from tgstation/Cyberboss-patch-3 
Fixes toolarm grammar
 2018-01-11 17:12:47 -06:00
Leo
fc8de4df70 Merge pull request #34282 from Cyberboss/ClosetFix22 
Fix hitting closets with wrenches
 2018-01-11 17:11:37 -06:00
deathride58
e17ce47aad Merge pull request #4766 from Citadel-Station-13/upstream-merge-34164 
[MIRROR] Fixes megafauna being able to port through jaunt tunnels due to snowflake code
 2018-01-11 21:33:52 +00:00
deathride58
e052255e91 Merge pull request #4768 from Citadel-Station-13/upstream-merge-34265 
[MIRROR] fixes safety check
 2018-01-11 21:33:35 +00:00
AnturK
7a4eef12b8 Fixes mind transfers (#34329) 
* Fixes mind transfers

* Don't really see how this is better but sure.
 2018-01-11 15:28:41 -06:00
LetterJay
7c2662f1de custom item 2018-01-11 15:25:47 -06:00
LetterJay
fe63605054 Update vehicle_actions.dm 2018-01-11 15:20:13 -06:00
LetterJay
d6fc0f5d26 Update position_point_vector.dm 2018-01-11 15:20:02 -06:00
LetterJay
c98be44b33 Merge pull request #4762 from Citadel-Station-13/upstream-merge-33817 
[MIRROR] [READY]Pulling claw 2
 2018-01-11 15:19:11 -06:00
LetterJay
d04260eab2 Merge pull request #4761 from Citadel-Station-13/upstream-merge-34206 
[MIRROR] Fixes twohanded weapons not unwielding when you lose an arm.
 2018-01-11 15:18:55 -06:00
LetterJay
ef1ac1f0f3 Merge pull request #4760 from Citadel-Station-13/upstream-merge-34204 
[MIRROR] improves chem macro feedback
 2018-01-11 15:18:43 -06:00
LetterJay
fe6fb09ce7 Merge pull request #4758 from Citadel-Station-13/upstream-merge-34189 
[MIRROR] CHECK_TICK & logging for cmd_admin_areatest
 2018-01-11 15:17:24 -06:00
LetterJay
878b16e41a Merge pull request #4757 from Citadel-Station-13/upstream-merge-34177 
[MIRROR] Prevents renaming uniquely named pets.
 2018-01-11 15:16:38 -06:00
LetterJay
76c423e65d Merge pull request #4756 from Citadel-Station-13/upstream-merge-34168 
[MIRROR] Corrects runtime when shooting humans
 2018-01-11 15:16:16 -06:00
LetterJay
2e6891f0c2 Merge pull request #4755 from Citadel-Station-13/upstream-merge-34242 
[MIRROR] Precision in timekeeping is important, okay.
 2018-01-11 15:16:05 -06:00
LetterJay
36a5b861f6 Merge pull request #4754 from Citadel-Station-13/upstream-merge-34216 
[MIRROR] Adds Display Name Argument to Techweb Logging
 2018-01-11 15:15:54 -06:00
LetterJay
4ac9269cdf Update configuration.dm 2018-01-11 15:15:50 -06:00
LetterJay
9f9550d5ba Merge pull request #4752 from Citadel-Station-13/upstream-merge-34249 
[MIRROR] Replace CentComm with CentCom
 2018-01-11 15:15:28 -06:00
LetterJay
387f8b973d Merge pull request #4750 from Citadel-Station-13/upstream-merge-34253 
[MIRROR] Fixes potato cells missing wires
 2018-01-11 15:14:48 -06:00
LetterJay
25d231fc20 Merge pull request #4749 from Citadel-Station-13/upstream-merge-34223 
[MIRROR] Stops the dbadmin warning if SQL_ENABLED isnt set
 2018-01-11 15:14:32 -06:00
LetterJay
92e8f3cefc Merge pull request #4748 from Citadel-Station-13/upstream-merge-34222 
[MIRROR] Fixes error if next_map.json is missing
 2018-01-11 15:14:19 -06:00
oranges
cfa8b8bad4 Merge pull request #34265 from tgstation/welostcountofhowmanycookieswerespawnedshutitalldown 
fixes safety check
 2018-01-11 14:13:09 -06:00
kevinz000
583bd42772 Fixes vehicle action handling ordering 2018-01-11 14:11:52 -06:00
kevinz000
6f96c169e1 Fixes megafauna being able to port through jaunt tunnels due to snowflake code (#34164) 
* Fixed megafauna porting through jaunt tunnels

* Update portals.dm
 2018-01-11 14:10:41 -06:00
oranges
b128c9d3b5 Merge pull request #34117 from ShizCalev/medbot-tweak 
Makes medbots unable to inject you if you are are fully covered with THICKMATERIAL.
 2018-01-11 14:07:28 -06:00
Tad Hardesty
72319a9794 Replace hardcoded z-level numbers with a trait system 2018-01-11 14:06:17 -06:00
arsserpentarium
1d91243ae2 [READY]Pulling claw 2 (#33817) 
Pulling claw is integrated circuit,which allows drones to pull things.
 2018-01-11 14:03:52 -06:00
oranges
6dfb1e2351 Merge pull request #34206 from ShizCalev/fireaxe-drop 
Fixes twohanded weapons not unwielding when you lose an arm.
 2018-01-11 14:02:42 -06:00
oranges
d8f232bd07 Merge pull request #34204 from ShizCalev/chem-macro-feedback 
improves chem macro feedback
 2018-01-11 14:02:35 -06:00
Leo
337ed7f0a6 Merge pull request #34189 from ShizCalev/test-area-tick 
CHECK_TICK & logging for cmd_admin_areatest
 2018-01-11 07:40:41 -06:00
Leo
5cb74c909c Merge pull request #34177 from ShizCalev/pet-rename 
Prevents renaming uniquely named pets.
 2018-01-11 07:40:33 -06:00
Leo
bc7b34d369 Merge pull request #34168 from ShizCalev/dna-human-runtime 
Corrects runtime when shooting humans
 2018-01-11 07:40:26 -06:00
Leo
7efa8098fa Merge pull request #34242 from Someguynamedpie/patch-1 
Precision in timekeeping is important, okay.
 2018-01-11 07:40:19 -06:00
ExcessiveUseOfCobblestone
af4f017b93 Adds Display Name Argument to Techweb Logging (#34216) 
* Update _techweb.dm

* Replaces ID with the name of the tech web

* REVERT ON THE WEBBITOR

* Webbitor Blues

* removes "
 2018-01-11 07:40:11 -06:00
Leo
f9309d4716 Fixes configuration not loading 2018-01-11 07:39:59 -06:00