cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 17:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,172 Commits 26 Branches 2 Tags
cedfc2ccbfaca3e92d74bfbfd714d3c060d8fdcb
Commit Graph

14696 Commits

Author SHA1 Message Date
Markolie
cedfc2ccbf Announcement fixes 2017-01-19 15:12:20 +01:00
Markolie
1f243ec4f0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 
# Conflicts:
#	code/_globalvars/lists/objects.dm
 2016-12-31 17:54:06 +01:00
Fox McCloud
761fc99bb8 Merge pull request #6032 from Crazylemon64/ghost_gateway_fix 
Ghosts can now click on the home gateway to teleport
 2016-12-31 01:47:45 -05:00
Fox McCloud
69ed9fcaa9 Merge pull request #6040 from Crazylemon64/manipulator_permissions 
Shuttle Manipulator can now only be used by admins
 2016-12-30 06:54:07 -05:00
Fox McCloud
5764b6367c Merge pull request #6043 from Crazylemon64/runtime_fixes 
Runtime fixes
 2016-12-30 06:50:45 -05:00
Crazylemon64
cc697715b9 Fixes a plant splicing runtime 
Plants no longer runtime when splicing a potency-scaling reagent onto a
non-scaling reagent (grass onto poisonberries)
 2016-12-30 01:04:59 -08:00
Crazylemon64
017f7c2776 Tweaks the listdiff proc to work as prior to avoid runtimes 
I adjusted the noir glasses accordingly so that they would work with this
 2016-12-30 00:53:52 -08:00
Crazylemon64
7498382909 Fixes a runtime when attempting to assemble an incomplete pod frame 2016-12-30 00:10:35 -08:00
Crazy Lemon
29f9cd49a3 Merge pull request #5631 from FalseIncarnate/pogo 
Nano-Mob Hunter GO!
 2016-12-29 22:58:01 -08:00
FalseIncarnate
e72fd8eae2 Fixes up battle terminal connections 
Also increases the range on the first battle turn announcement to be
audible by both combatants, just like the turn announcements during the
battle.
 2016-12-30 00:12:02 -05:00
Crazy Lemon
22cdb9adcb Merge pull request #6042 from FalseIncarnate/bug_fix 
Bug fixes
 2016-12-29 18:58:31 -08:00
Crazy Lemon
eb07245894 Merge pull request #6027 from KasparoVy/le-film-noir-est-fini 
Returns Colour Vision when you Unequip Noir Glasses
 2016-12-29 18:57:03 -08:00
FalseIncarnate
27e7dabed7 Pick up that paper 
Photocopiers and Fax Machines will now attempt to place the removed
source material into the hand of the user... if they are human only.
 2016-12-29 21:46:20 -05:00
Crazy Lemon
d0ed0ecff2 Merge pull request #6034 from FlattestGuitar/aifix 
Fixes AIs being blind after a power outage.
 2016-12-29 18:45:07 -08:00
FalseIncarnate
da421d841c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pogo 2016-12-29 21:13:00 -05:00
FalseIncarnate
eba3d10966 Fixes #6029 
Also applies to photocopiers (which fax machines are a subtype of), and
replaces a bunch of thing.loc = src.loc and thing.loc = src with proper
forceMove calls
 2016-12-29 20:40:57 -05:00
Crazylemon64
3a64de1ffe Manipulator has perms now 2016-12-29 17:22:47 -08:00
Crazy Lemon
ac597b7f8b Merge pull request #5806 from Markolie/cameraconsoleupdate 
Camera console update
 2016-12-29 01:18:21 -08:00
Crazy Lemon
adf431b087 Merge pull request #5414 from Aurorablade/DWI 
Template Shuttles
 2016-12-29 01:12:52 -08:00
Mieszko Jędrzejczak
b2640032d6 Fixes AIs being blind after a power outage. 2016-12-28 22:28:54 +01:00
Crazy Lemon
a2cd084fc9 Merge pull request #6016 from KasparoVy/altappearances-camerafix 
Cameras Now Handle Disguises
 2016-12-25 01:33:00 -08:00
Crazylemon64
67cb9ab4b1 Ghosts can now click on the home gateway to teleport 
The away mission gateways still worked
 2016-12-24 22:42:47 -08:00
KasparoVy
0ec94ab50e Improves maintainability of Noir Glasses. 2016-12-25 00:49:46 -05:00
KasparoVy
b49665f533 Returns Colour Vision when you Unequip Noir Glasses 
Fixes a bug where taking off noir glasses while noir mode was on didn't
give you your colour vision back.
 2016-12-24 02:25:55 -05:00
FalseIncarnate
164585e9da Snow Wars Episode II: Attack of the Claus 
Santa's back, and angrier than ever at the naughty spacestation crew!

Santa's maximum health now increases with each successive stage
(previously only increased at Stage 4)
- Stage 1: 150 health (unchanged)
- Stage 2: 200 health (what stage 4 used to be)
- Stage 3: 250 health
- Stage 4: 300 health

Santa's Melee forms have had their damage ranges buffed
- Previously 5-15 in Stage 1 and 15-25 in Stage 4, now 10-20 and 20-30
respectively

Melee Snowmen and Reindeer have had their health increased to provide
extra survivability as they attempt to get into attack range. Ranged
snowmen unchanged
- Snowmen: was 50, now 75
- Reindeer: was 50, now 80

Ranged snowmen can no longer drop the candy cane sword, as intended.
Drop chance unchanged (50% from melee snowmen)

Snowballs (ranged snowman attack) and Ornaments (Santa Stage 2 and Stage
3 attack) have had damage increased slightly. Ornament knockback
unchanged.
- Snowballs now deal 4 damage, was 3
- Ornaments now deal 7 damage, was 5

The away_mission_config.txt file in the /config folder will need to be
manually editted to reactivate the evil santa away mission.
 2016-12-24 02:24:40 -05:00
Aurorablade
494040ea9d i feel sorry for everyone subscriving to this PR 2016-12-24 00:42:58 -05:00
Aurorablade
e25ddf8329 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI 2016-12-24 00:18:40 -05:00
Fox McCloud
1b1aaa83c4 Merge pull request #6022 from Crazylemon64/comp3_machine_fix 
Computer3 machines no longer set the user's machine to a datum
 2016-12-23 22:19:13 -05:00
KasparoVy
59d7f71145 👀 2016-12-23 21:14:50 -05:00
Crazylemon64
9341861406 Computer3 machines no longer set the user's machine to a datum 2016-12-23 18:09:40 -08:00
Crazylemon64
526335a9b6 Paper hats and bandanas no longer runtime on {un,}equip 2016-12-23 17:19:50 -08:00
Crazy Lemon
11311b1c18 Merge pull request #6018 from Fox-McCloud/refactor-fix 
Fixes Nightvision, Darksight, and X-Ray
 2016-12-23 13:12:43 -08:00
Markolie
e2587dbbbf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 
# Conflicts:
#	code/game/gamemodes/events.dm
#	code/modules/awaymissions/bluespaceartillery.dm
 2016-12-23 19:04:35 +01:00
Markolie
84c8b2e12b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cameraconsoleupdate 
# Conflicts:
#	code/game/machinery/computer/camera.dm
 2016-12-23 18:58:58 +01:00
Tigercat2000
f80dae7fae Fix AI vision 2016-12-23 07:22:59 -08:00
Fox-McCloud
1e1b0d5a1f Fixes Nightvision, Darksight, and X-Ray 2016-12-23 10:06:15 -05:00
Fox-McCloud
0e2325039c Robot Component Fix 2016-12-23 08:00:36 -05:00
Fox McCloud
546f149a4f Merge pull request #5955 from athompson11/Cherrypick 
Rejuvenate now properly handles broken Robot components
 2016-12-23 07:53:19 -05:00
Fox McCloud
5a01a6c7d3 Merge pull request #5840 from Crazylemon64/adds_reset_perspective 
Polishes up `reset_view`
 2016-12-23 07:27:36 -05:00
Fox McCloud
aab6715082 Merge pull request #5962 from KasparoVy/fixes-monochromatic-bugs 
Refines Cloning, Fixes a Couple Genetics-related Bugs.
 2016-12-23 07:19:06 -05:00
KasparoVy
3e6ea1f9f4 Removes some unnecessary redundance 
Forgot to cut this out earlier. Tested without this bit of code in the
exact same way as the PR specifications and no functionality was lost.
 2016-12-21 23:50:12 -05:00
KasparoVy
e00814e36c Cameras Now Handle Disguises 
Fixes a bug where you could take a picture of stuff behind walls (ghetto
X-Ray).
Pictures will now render people with disguises as you see them (borgs
see people with cardborg suits as borgs, people with cardborg suits see
themselves as borgs, everyone sees people carrying plants as plants)
although they will also state the person's name, regardless of disguise
(same as mouseover).
 2016-12-21 22:31:13 -05:00
Crazylemon64
bed732d505 Addresses Fox's requests 2016-12-21 17:59:08 -08:00
Crazylemon64
339a187f9f Fixes vision updates such as implants and similar 2016-12-21 17:59:08 -08:00
Crazylemon64
c0cd2c263f Switches reset_view to reset_perspective 2016-12-21 17:59:08 -08:00
Crazylemon64
6d3e66f41c Polishes up the reset_view proc, which is basically 
`reset_perspective` from tgstation.

Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things

Recommit because we're using different compiler versions
 2016-12-21 17:56:57 -08:00
Crazy Lemon
cf2f02e2c6 Merge pull request #5985 from Fox-McCloud/wall-rot 
Wall Rot Effect Refactor
 2016-12-21 17:43:45 -08:00
FalseIncarnate
b0e87ea7d3 Moved/renamed controller file 2016-12-21 18:17:47 -05:00
FalseIncarnate
48cf5148f0 cleanup 2016-12-21 17:36:10 -05:00
Fox McCloud
a8f6f6a0ad Merge pull request #6014 from tigercat2000/alien_fix_alt 
Fix xenomorph organ surgery (properly)
 2016-12-21 13:25:27 -05:00