cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,442 Commits 14 Branches 2 Tags
edf2bfc4fc41b5bd7b66adbbae495de3c48bbb48
Commit Graph
1088 Commits
Author SHA1 Message Date
Fox McCloud 15c9873cdf Merge pull request #2224 from Markolie/shitcode 
Strange reagent fix, tod --> timeofdeath
 2015-09-29 18:25:04 -04:00
Markolie 8b2e62fc10 Strange reagent fix, tod --> timeofdeath 2015-09-29 22:03:04 +02:00
Mark van Alphen bee80d49cb Merge pull request #2211 from Crazylemon64/stickier_beakers 
Stickier cyborg beakers
 2015-09-29 21:55:48 +02:00
Crazylemon 9678fe09ec Replaced location setting with forceMove() 
I'm restricting this only to the machine's I'm affecting with this fix.
Refactoring the rest of the code to use it would be for a different
thing.
 2015-09-29 11:09:38 -07:00
Crazylemon a1636b3b24 NODROP is now more respected 
A few machines, especially in medical, didn't respect NODROP. Hopefully
with these changes, medical cyborgs should no longer get their beaker
stuck in some sort of bizarre multipositional limbo.
 2015-09-28 14:48:06 -07:00
Markolie f69beaeb00 Drone fix, runtime fixes 2015-09-28 03:34:33 +02:00
Fox-McCloud 821d2d0309 Merge pull request #2167 from Markolie/SDQL 
Add SDQL, +PROCCALL, admin updates
 2015-09-26 17:40:03 -04:00
Mark van Alphen 1e9cce8f49 Merge pull request #2169 from Fox-McCloud/pick-your-poison 
Toxin Tweak
 2015-09-26 23:36:20 +02:00
Markolie d4e5149389 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fluff 
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
 2015-09-26 05:12:52 +02:00
Tigercat2000 4b6a3ddcb6 -tg- SpaceMove update 
This commit updates the spacemove system to -tg-'s; All objects now drift
in space, not just mobs. A few hardcoded space checks have been replaced
with has_gravity(); So it applies to zero-G as well as space.

Spacepods no longer drift, because their snowflakey shitcode just doesn't
work. So they just move.
 2015-09-25 15:53:59 -07:00
Fox-McCloud 058af509f6 Toxin Tweak 2015-09-25 17:30:24 -04:00
Markolie 24337913cd Add SDQL, +PROCCALL, admin updates 2015-09-25 16:54:27 +02:00
Markolie e96103a02b Fluff item clean-up 2015-09-25 04:31:30 +02:00
Crazylemon 4c941a9072 Fixes up Polonium to work with NO_DNA_RAD 
Did a search through the codebase, thought it might be good to patch up
other things that touch the radiation variable.
 2015-09-24 15:54:15 -07:00
Mark van Alphen 16090e6a1f Merge pull request #2129 from Fox-McCloud/chem-proc-change 
Changes a Chemistry Transfer Proc
 2015-09-23 19:50:20 +02:00
Fox-McCloud 71001cc5ea Changes a Chemistry Transfer Proc 2015-09-22 05:56:49 -04:00
Markolie 3c7413dc65 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
 2015-09-22 00:17:30 +02:00
Markolie f7234374b5 Update armour penetration checks 2015-09-21 22:54:26 +02:00
Markolie ea305d3ffa Saber SMG update, add armour piercing variable 2015-09-21 22:50:07 +02:00
Mark van Alphen 3510e6c863 Merge pull request #2104 from Fox-McCloud/spray-bottle-nerf 
Spray Bottle Nerf
 2015-09-21 02:10:43 +02:00
Mark van Alphen 44fc7e80e2 Merge pull request #2103 from Fox-McCloud/reagent-balance 
Reagent Balance Tweaks
 2015-09-21 02:10:36 +02:00
Mark van Alphen 467b51f3d2 Merge pull request #2102 from Fox-McCloud/reagent-skin-rework 
Reagent Skin Penetration Rework
 2015-09-21 02:10:26 +02:00
Fox-McCloud be4607d70d Spray Bottle Nerf 2015-09-19 09:09:01 -04:00
Fox-McCloud 9b5d15b0a6 Reagent Balance Tweaks 2015-09-19 08:48:10 -04:00
Fox-McCloud 705fb90b76 Reagent Skin Penetration Rework 2015-09-19 07:19:06 -04:00
Fox-McCloud 47d14c3b7e Chemistry: Patch Balance 2015-09-18 22:33:40 -04:00
Mark van Alphen 739e820faa Merge pull request #2078 from Fox-McCloud/experimentor 
EXPERI-Mentor Addition--Telesci Removal
 2015-09-18 07:18:55 +02:00
Fox-McCloud 02b0edb6ed Fixes Reagents GCing and Runtimes 2015-09-17 03:00:05 -04:00
Fox-McCloud d41b09c0a6 Experimentor Addition--Telesci Removal 2015-09-17 00:59:38 -04:00
Fox-McCloud bef21a964d Merge pull request #2068 from Markolie/lawstate 
Welding tool refactor, in-hand updates
 2015-09-16 19:07:29 -04:00
Mark van Alphen d708ee8d84 Merge pull request #2058 from Fox-McCloud/cluster-grenade-cleanup 
Cluster Grenade Cleanup
 2015-09-16 20:22:38 +02:00
Fox-McCloud cf21717a76 Merge pull request #2055 from Markolie/lesser 
Switch spray admin messages to attack messages
 2015-09-15 22:04:21 -04:00
Markolie 611cb16df8 Add torch, more in-hand fixes 2015-09-16 03:22:01 +02:00
Tigercat2000 c562680098 Merge remote-tracking branch 'origin/master' into bay_examine 
# Conflicts:
#	code/game/objects/structures/displaycase.dm
 2015-09-15 14:08:36 -07:00
Fox-McCloud 844d203d0e cleanup and restructure 2015-09-15 06:52:06 -04:00
Fox-McCloud 1979043d84 Cluster Grenade Cleanup 2015-09-15 00:04:57 -04:00
Markolie 90f722d752 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom 
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi
 2015-09-15 04:18:27 +02:00
Markolie fae3e78270 Switch spray admin messages to attack messages 2015-09-15 04:01:19 +02:00
Tigercat2000 0603f73232 Bay12 examine overhaul. 
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
 2015-09-14 11:51:40 -07:00
Fox-McCloud 9d2dab6917 Reagents Performance and Garbage Collection 2015-09-14 04:49:29 -04:00
Fox-McCloud 3ce1e989ce Materials Consistency Fix/Update 2015-09-13 17:49:36 -04:00
Markolie ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +02:00
Fox-McCloud f31bf75764 Blob Rebalance 2015-09-10 19:12:59 -04:00
Mark van Alphen 84b42c5491 Merge pull request #1986 from Fox-McCloud/nuke-and-tator 
Nuke Ops and Traitor Update+Balance
 2015-09-10 02:24:32 +02:00
Fox-McCloud 385dc0d47b Space Cleaner Lighting Fix 2015-09-09 18:52:27 -04:00
Fox-McCloud 1c6c733a52 Nuke Ops and Traitor Update+Balance 2015-09-08 19:38:30 -04:00
Tigercat2000 ee32c0a35a Merge branch 'master' into intent_define 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
 2015-09-08 04:43:13 -07:00
Tigercat2000 f7f19eac59 Merge branch 'master' into reageaaaannntttttts 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

+ apply cleaner patch manually
 2015-09-07 16:02:17 -07:00
TheDZD 8cb3ffaf58 Merge pull request #1956 from Fox-McCloud/perdy-colors 
Space Cleaner Feature: Color Removal
 2015-09-07 17:24:57 -04:00
Tigercat2000 be92665871 Replace magic intent words with defines, grab fixes 
This commit does the following:
 - Replaces all instances of magic intent words, like "harm" and
 "help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM

 - Fixes a few manual grab instances left over in attack_alien, they
 will now used grabbedby()
 2015-09-07 11:51:00 -07:00