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

2995 Commits

Author SHA1 Message Date
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
deathride58
eedf8eb101 Update cit_objectives.dm 2018-01-11 20:19:09 -05:00
deathride58
15f0b623ba Update cit_objectives.dm 2018-01-11 19:40:19 -05: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
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
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
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
Tad Hardesty
149542ca26 Replace CentComm with CentCom in deadchat message (#34249) 2018-01-11 07:39:52 -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
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
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
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
1cedccf568 Update shields.dm 2018-01-10 14:49:35 -05: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
56d37b17fe Merge pull request #34185 from Jordie0608/quickenedspellislameanywaypicktwinnedandempoweredinsteadorsubtleifyouhatenpcs 
Fixes feedback spell level var
 2018-01-10 03:12:31 -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
Robustin
34919f7bce Fixes reflections 2018-01-10 03:11:48 -06:00
deathride58
ecaf3546f1 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-34105 2018-01-08 15:35:45 -05:00
deathride58
b99f13f1bc Merge pull request #4717 from Citadel-Station-13/upstream-merge-33768 
[MIRROR] Fixes vitality matrices giving massively more vitality than they should
 2018-01-08 20:04:08 +00:00
deathride58
6957a6f13f Merge branch 'master' into upstream-merge-34105 2018-01-08 20:03:41 +00:00
Ashe Higgs
15f961958e Fixes vitality matrices giving massively more vitality than they should (#33768) 
* Fixes vitality matrix shenanigans

* Replaces the spawn_dust() with a variable check

* Update clock_sigils.dm
 2018-01-08 03:51:10 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
deathride58
39614f685e Merge pull request #4712 from Citadel-Station-13/upstream-merge-34100 
[MIRROR] Adds spaceturf check to blob overmind spawning
 2018-01-08 06:17:23 +00:00
deathride58
6b27e322b8 Merge pull request #4714 from Citadel-Station-13/upstream-merge-34125 
[MIRROR] Makes the chaplain's soulshard require death
 2018-01-08 04:19:45 +00:00
deathride58
9decb2e2b2 Update overmind.dm 2018-01-07 23:18:28 -05:00
deathride58
984bf470d5 Merge pull request #4710 from Citadel-Station-13/upstream-merge-34093 
[MIRROR] fixes some grinder recipes
 2018-01-08 04:17:29 +00:00
deathride58
57d8457108 Merge pull request #4705 from Citadel-Station-13/upstream-merge-33645 
[MIRROR] Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog
 2018-01-08 04:15:47 +00:00
deathride58
ba909ce9a2 Merge pull request #4704 from Citadel-Station-13/upstream-merge-34128 
[MIRROR] Removes the safe dial multiplier
 2018-01-08 04:15:12 +00:00
deathride58
d1d2ed1139 Merge pull request #4699 from Citadel-Station-13/upstream-merge-34157 
[MIRROR] Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason
 2018-01-08 04:13:47 +00:00
Dax Dupont
d057f55ed4 Makes the chaplain's soulshard require death (#34125) 2018-01-07 20:56:24 -06:00
oranges
1e9598dfbd Clean up a bunch of undefined arg runtimes 2018-01-07 20:53:12 -06:00
MoreRobustThanYou
02b63e199b Adds spaceturf check to blob overmind spawning 2018-01-07 20:52:01 -06:00
Tlaltecuhtli
7aa8bf9b69 fixes some grinder recipes (#34093) 
* commit

help what is this

* ddd

* sdsadsda

* fegdhfd

* ddddddddddddddd
 2018-01-07 20:36:29 -06:00
Ashe Higgs
c3712f5be5 Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog (#33645) 
* Objects touched by servants now warp to the Ark

* Check by servant

* Replaces with a baselock

* Updates the 'log
 2018-01-07 20:18:28 -06:00
Jordan Brown
bc636ddb2c Merge pull request #34128 from ShizCalev/safe-dial 
Removes the safe dial multiplier
 2018-01-07 20:08:11 -06:00