cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-09 17:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,949 Commits 26 Branches 2 Tags
d02165e0f94de2c4a9399a8699cc355da4f8a329
Commit Graph

9380 Commits

Author SHA1 Message Date
Fox McCloud
06713d604f Atmos Define Cleanup + Plasma Tweaks 2019-04-09 11:22:01 -04:00
Arkatos1
da73c134db Ghosts now orbit their followed targets 2019-04-09 02:17:40 +02:00
Arkatos1
21d212767f Summon Ghosts spell 2019-04-08 21:45:09 +02:00
Fox McCloud
03d894ecfc Merge remote-tracking branch 'upstream/master' into fix-cqc 
# Conflicts:
#	code/game/objects/items.dm
 2019-04-07 19:54:14 -04:00
Crazy Lemon
b59a5d37b6 Merge pull request #11266 from Markolie/hotkeymode 
Fix Hotkey Toggle button
 2019-04-07 14:16:06 -07:00
Mark van Alphen
ddc3a02ab3 Fix thermal for saboteur, reinforcement bugfix, re-add C4 pack 2019-04-07 23:04:43 +02:00
Mark van Alphen
f63b587f54 Nuke ops updates 2019-04-07 21:57:22 +02:00
Mark van Alphen
91e6cb9347 Fix hotkey mode button 2019-04-07 18:42:08 +02:00
variableundefined
ff8dc59367 Merge pull request #11229 from Fox-McCloud/reagent-tweaks 
[Goonchem] Reagent tweaks
 2019-04-07 21:22:18 +08:00
variableundefined
fc616d8a19 Merge pull request #11242 from Markolie/hotkeymode 
Hotkey mode handling is now instantaneous
 2019-04-07 21:21:21 +08:00
variableundefined
525b28014c Merge pull request #11026 from farie82/popup-limiting 
Gives the option to limit the text popups to 1
 2019-04-07 20:41:24 +08:00
variableundefined
86ea35c25b Merge pull request #11161 from Kyep/terrorspider_patch_post_newcrit 
Terror Spider tweaks
 2019-04-07 20:30:48 +08:00
variableundefined
4f8494e89e Merge pull request #10999 from Kyep/ghost_verb 
Tweaks Ghost Verb
 2019-04-07 15:27:56 +08:00
Arkatos1
16a1a6d19a Shadowling text bolded in the Shadowling Hivemind 2019-04-07 04:06:47 +02:00
Fox McCloud
8446632fbc The Nations Update Everyone Deserves! 2019-04-06 20:30:04 -04:00
Mark van Alphen
2ba56c33de Code review fix 2019-04-06 06:17:29 +02:00
Mark van Alphen
aa58a88296 Switch to client-side hotkey toggling 2019-04-05 22:45:05 +02:00
joep van der velden
75d9852d33 Perps no longer need glasses to be set 2019-04-05 09:35:43 +02:00
Mark van Alphen
391d91132c Fix code review issues (planetary_atmos and Initialize()) 2019-04-04 23:23:30 +02:00
Arkatos1
773865961b Colored title for Shadowlings in the Shadowling Hivemind 2019-04-04 22:08:49 +02:00
Mark van Alphen
a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2019-04-04 22:04:55 +02:00
Mark van Alphen
33d6017e28 Merge branch 'turfs' of https://github.com/Markolie/Paradise into turfs 2019-04-04 22:01:50 +02:00
Mark van Alphen
877cfc4d7d Refactor catwalks to not be floors, update chasms and fix Lavaboat 2019-04-04 22:01:25 +02:00
Mark van Alphen
d077138c3d Merge pull request #4 from CornMyCob/turfs 
blood drunk miner
 2019-04-04 21:41:45 +02:00
CornMyCob
e02087d474 blood drunk miner 2019-04-04 20:34:26 +01:00
Mark van Alphen
99c470531f Add Swarmer megafauna/ruin, refactor medals so it's a subsystem. The catwalk's not yet functional 2019-04-04 17:43:15 +02:00
Fox McCloud
503f8a7036 fix brains 2019-04-04 07:59:11 -04:00
Fox McCloud
685b2191f3 Newecrit Death Tweak 2019-04-04 07:12:18 -04:00
Fox McCloud
282350fb71 Tweaks Foam and Pyrotechnics 2019-04-04 05:06:39 -04:00
Mark van Alphen
731bc60958 Merge pull request #3 from CornMyCob/turfs 
Stuff
 2019-04-03 22:28:17 +02:00
CornMyCob
7eb4277a01 MORE UPDATES! 2019-04-03 20:29:16 +01:00
Mark van Alphen
19b923c999 Ash Walker/Gutlunch fixes. Glass containers now do not splash on help intent, for milking. 2019-04-03 17:24:55 +02:00
Crazy Lemon
e2a9d0556f Merge pull request #11211 from Fox-McCloud/fix-the-thing 
Fixes Some Species Having Oxy Damage
 2019-04-02 15:49:48 -07:00
CornMyCob
9f5b3fc796 updates 2019-04-02 20:26:23 +01:00
Arkatos1
bd7c97e5c0 Adds bigger fonr for the Shadowlings in the Shadowling hivemind 2019-04-02 21:07:15 +02:00
Fox McCloud
4b444860fd Fixes Some Species Having Oxy Damage 2019-04-02 14:25:29 -04:00
Fox McCloud
43338beffe Merge pull request #11126 from Arkatos1/Syndie_Borg_Medibeam 
Adds Medical Beamgun to a Syndicate Medical Cyborg
 2019-04-02 07:19:52 -04:00
variableundefined
b7c787b113 Merge pull request #11199 from Fox-McCloud/fixes-bees 
Fixes Bees
 2019-04-02 18:26:45 +08:00
Fox McCloud
49a1569eaa Merge pull request #11117 from farie82/fixe-antidrop-and-resting-issue 
Fixes some antidrop edge cases and can't give items to resting people now
 2019-04-01 19:50:48 -04:00
Mark van Alphen
500675be77 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/structures/safe.dm
 2019-04-02 00:54:49 +02:00
Fox McCloud
0b06a32cc9 Merge pull request #11165 from Markolie/issues 
Resolve some issues that the compiler doesn't spot
 2019-04-01 18:22:43 -04:00
Fox McCloud
ce1f6d4424 Merge pull request #11202 from dovydas12345/AI-anchor 
Fixes AI's ability to toggle floor bolts
 2019-04-01 17:54:36 -04:00
farie82
2922578c6b no more \the 2019-04-01 23:31:46 +02:00
Fox McCloud
860ac8010f Merge pull request #11139 from farie82/bluespace-golem-fix 
Adds a restraint on the casting of the bluespace golem teleport
 2019-04-01 17:27:39 -04:00
Fox McCloud
a2842652e0 typecache for wants objects 2019-04-01 17:11:56 -04:00
Fox McCloud
e487b8b58e gosh dang 2019-04-01 16:22:20 -04:00
Dovixx
cfa64189cc Update 2019-04-01 19:59:11 +03:00
Mark van Alphen
57366118af Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 2019-04-01 17:55:37 +02:00
variableundefined
b0f64016a9 Merge pull request #11158 from Fox-McCloud/delayed-gibbing 
Makes Delayed Gibbing a Proc
 2019-04-01 23:07:17 +08:00
Kyep
cdeb68825d REVERT: terror spiders no longer ignore newcrit in this PR 2019-04-01 03:10:21 -07:00