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

7705 Commits

Author SHA1 Message Date
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
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
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
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
Jordan Brown
d8c3157741 Fixes error if next_map.json is missing (#34222) 2018-01-11 07:39:22 -06:00
AnturK
e381116bbe Fixes beams failing to qdel properly. Maybe. (#34254) 2018-01-11 07:38:55 -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
74d918c0b2 Merge pull request #4742 from Citadel-Station-13/upstream-merge-34217 
[MIRROR] Fixes FIND_REF_NO_CHECK_TICK not actually disabling world.loop_checks
 2018-01-10 19:59:51 +00:00
deathride58
5abe6abad6 Merge pull request #4740 from Citadel-Station-13/upstream-merge-34209 
[MIRROR] Fixes missing defib inhands
 2018-01-10 19:58:57 +00:00
deathride58
f24bf9f9fd Merge pull request #4739 from Citadel-Station-13/upstream-merge-34139 
[MIRROR] Fixes archdevils creating wall girders when trying to destroy walls.
 2018-01-10 19:58:36 +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
400de30b93 Merge pull request #4737 from Citadel-Station-13/upstream-merge-34096 
[MIRROR] Cult will actually report victories now
 2018-01-10 19:57:56 +00:00
deathride58
df199bc940 Merge pull request #4736 from Citadel-Station-13/upstream-merge-34160 
[MIRROR] Fixes non-cultist hulks being able to hold cult bbs
 2018-01-10 19:57:35 +00:00
deathride58
d0cf5368b9 Merge pull request #4735 from Citadel-Station-13/upstream-merge-34194 
[MIRROR] Makes the tag warning a stack_trace
 2018-01-10 19:57:16 +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
f00252540b Merge pull request #4732 from Citadel-Station-13/upstream-merge-34185 
[MIRROR] Fixes feedback spell level var
 2018-01-10 19:56:30 +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
2ee5252a62 Merge pull request #4730 from Citadel-Station-13/upstream-merge-34170 
[MIRROR] Fixes non-holy mobs purifying BBS
 2018-01-10 19:55:35 +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
1cedccf568 Update shields.dm 2018-01-10 14:49:35 -05: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
deathride58
ea9c6eb490 Merge pull request #4725 from Citadel-Station-13/upstream-merge-34197 
[MIRROR] Unsets cache_lifespan
 2018-01-10 19:48:03 +00:00
Jordan Brown
7c7ecf1118 Fixes FIND_REF_NO_CHECK_TICK not actually disabling world.loop_checks (#34217) 2018-01-10 09:45:51 -06:00
Leo
c39de1e7ed Merge pull request #34209 from ShizCalev/defib-icon-fixes 
Fixes missing defib inhands
 2018-01-10 06:55:23 -06:00
Goodstuff
bc543c5220 Update twohanded.dm (#34139) 2018-01-10 03:51:23 -06: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
Robustin
1bd84a8f6b Cult will actually report victories now (#34096) 
* Cult victory fix

* Update cult.dm

* Correct cult victory report
 2018-01-10 03:46:55 -06:00
Jordan Brown
cb3506f319 Merge pull request #34160 from ShizCalev/cult-blade-drop 
Fixes non-cultist hulks being able to hold cult bbs
 2018-01-10 03:13:02 -06:00
Leo
805442ee51 Merge pull request #34194 from ninjanomnom/tag-stack 
Makes the tag warning a stack_trace
 2018-01-10 03:12:54 -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
56d37b17fe Merge pull request #34185 from Jordie0608/quickenedspellislameanywaypicktwinnedandempoweredinsteadorsubtleifyouhatenpcs 
Fixes feedback spell level var
 2018-01-10 03:12:31 -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
Leo
d8bcc0190d Merge pull request #34170 from ShizCalev/bbs-unholy 
Fixes non-holy mobs purifying BBS
 2018-01-10 03:12:16 -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