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

4421 Commits

Author SHA1 Message Date
Leo
ab76f05a1e Merge pull request #34305 from AutomaticFrenzy/patch/debug-mapping 
Add JMP buttons to mapping debug verbs
 2018-01-12 07:04:31 -06: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
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
Leo
0985450524 Merge pull request #34270 from tgstation/Cyberboss-patch-3 
Fixes toolarm grammar
 2018-01-11 17:12:47 -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
LetterJay
fe63605054 Update vehicle_actions.dm 2018-01-11 15:20:13 -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
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
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
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
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
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
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
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
Tad Hardesty
149542ca26 Replace CentComm with CentCom in deadchat message (#34249) 2018-01-11 07:39:52 -06:00
AnturK
d44d3c3f26 Fixes potato cells missing wires (#34253) 2018-01-11 07:39:37 -06:00
Jordan Brown
ab71f0293b Stops the dbadmin warning if SQL_ENABLED isnt set (#34223) 2018-01-11 07:39:29 -06:00
deathride58
84cb51be0c Merge pull request #4729 from Citadel-Station-13/upstream-merge-33436 
[MIRROR] [READY]Cargo Update: Nanotrasen Supply Drop Pods!
 2018-01-11 05:16:59 +00:00
deathride58
ff83b6451b Merge pull request #4727 from Citadel-Station-13/upstream-merge-34065 
[MIRROR] Fixes reflections
 2018-01-10 20:21:56 +00:00
deathride58
54c87fdd15 Merge pull request #4738 from Citadel-Station-13/upstream-merge-34111 
[MIRROR] Fixes buckled message spam for ghosts inside talking scythes
 2018-01-10 19:58:18 +00:00
deathride58
14d0857109 Merge pull request #4733 from Citadel-Station-13/upstream-merge-34187 
[MIRROR] Switches butchering/gib drops to use drop_location
 2018-01-10 19:56:54 +00:00
deathride58
d0e170d9f9 Merge pull request #4731 from Citadel-Station-13/upstream-merge-34169 
[MIRROR] Fixes fully_heal not curing disabilities
 2018-01-10 19:56:13 +00:00
deathride58
7c576c7d32 Merge pull request #4728 from Citadel-Station-13/upstream-merge-33933 
[MIRROR] Late joiners also get summoned guns/magic
 2018-01-10 19:50:33 +00:00
deathride58
5597c55064 Merge pull request #4722 from Citadel-Station-13/upstream-merge-34110 
[MIRROR] shadowshroom nerf reverted
 2018-01-10 19:48:53 +00:00
ShizCalev
594de23c1f Fixes buckled message spam for ghosts inside talking scythes (#34111) 
* Fixes buckled message spam for ghosts

* params
 2018-01-10 03:48:10 -06:00
Leo
88fa0ea83f Merge pull request #34195 from tgstation/Cyberboss-patch-1 
Fixes weakref runtimes
 2018-01-10 03:12:46 -06:00
Leo
5cc7492f0a Merge pull request #34187 from ShizCalev/butcher-droplocation 
Switches butchering/gib drops to use drop_location
 2018-01-10 03:12:39 -06:00
Leo
377ea0f68c Merge pull request #34169 from ShizCalev/heal-fix 
Fixes fully_heal not curing disabilities
 2018-01-10 03:12:23 -06:00
oranges
1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00
oranges
3b9b6f156e Merge pull request #33933 from coiax/wizard-late-joining 
Late joiners also get summoned guns/magic
 2018-01-10 03:11:56 -06:00
Robustin
34919f7bce Fixes reflections 2018-01-10 03:11:48 -06:00
deathride58
34297d5005 fixes setting flavortext in preferences. hopefully 2018-01-09 23:11:22 -05:00
deathride58
78df6facb6 fixes flavortext readmores for real this time 2018-01-09 22:59:22 -05:00
AnturK
f6ef771ccd Fixes teleport camera (#34113) 2018-01-08 22:09:14 -06:00
oranges
3671228196 Merge pull request #34110 from Armhulen/patch-40 
shadowshroom nerf reverted
 2018-01-08 20:07:57 -06:00
deathride58
9337c29450 who will win: a thousand yiffy snowflakes, or 1 misplaced \" 2018-01-08 18:24:47 -05:00
deathride58
ecaf3546f1 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-34105 2018-01-08 15:35:45 -05:00
deathride58
ca4c2da248 Merge pull request #4718 from Citadel-Station-13/upstream-merge-34074 
[MIRROR] Updates test areas debug command
 2018-01-08 20:04:28 +00:00
deathride58
6957a6f13f Merge branch 'master' into upstream-merge-34105 2018-01-08 20:03:41 +00:00
ShizCalev
f54854bca8 Updates test areas debug command (#34074) 
* Sanity check for test areas debug command

* Shifted to popup window
 2018-01-08 04:39:09 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
deathride58
e39ae49a2e !!experimental!! fix for flavortext readmore 2018-01-08 01:15:40 -05:00