cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-31 07:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,080 Commits 15 Branches 2 Tags
9235af2a3d501dfd3fc875739a6d33774f9394ba
Commit Graph
649 Commits
Author SHA1 Message Date
Fox-McCloud 9235af2a3d Tweaking 2015-03-01 17:34:03 -05:00
Fox-McCloud 3bed31e08c Chemistry Cleanup and Fixes 2015-03-01 16:34:23 -05:00
Mark van Alphen 5b4c156989 Merge pull request #459 from ZomgPonies/corgi 
Ports CorgiUI
 2015-03-01 18:30:21 +01:00
Markolie f7426c8d72 Add bandanas, mask toggling, camo armor jacket and bugfixes 2015-02-28 17:09:45 +01:00
ZomgPonies ba2b5589e9 Ported CorgiUI 2015-02-28 10:59:14 -05:00
Markolie 20ac07de8d Bug fixes 2015-02-27 17:51:57 +01:00
Markolie e9e4437e91 Re-add nymph code 2015-02-25 22:26:38 +01:00
Markolie d9f083c39c Fix nanites 2015-02-25 22:25:22 +01:00
Markolie 5d529c8086 Plant-B-Gone now affects Diona nymphs. Dionas now heal toxin/fire damage. 2015-02-25 22:07:23 +01:00
Markolie bfe8a12f1e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
 2015-02-25 20:44:32 +01:00
Markolie 6efa3bcdaa Fix trays (now bags) 2015-02-25 20:42:43 +01:00
Markolie e1f0d0fec7 Bug fixes, add atmos watertank 2015-02-25 19:47:04 +01:00
Mark van Alphen ab98e134e1 Merge pull request #423 from ZomgPonies/master 
Emergency GC fix for reagents
 2015-02-25 18:18:07 +01:00
ZomgPonies 739882d6d1 Emergency GC fix for reagents 2015-02-25 12:14:18 -05:00
ZomgPonies 3e4b4d2b6a Merge pull request #406 from SamCroswell/master 
ERT Rework
 2015-02-25 11:43:07 -05:00
Markolie b44255d250 Bug fixes 2015-02-24 18:57:12 +01:00
SamCroswell cd7b1a4075 ERT Rework - Part One 2015-02-24 09:47:44 -05:00
Markolie 004b365110 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/modules/reagents/reagent_containers/syringes.dm
 2015-02-22 22:15:45 +01:00
Markolie 672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Fox-McCloud bea78f2432 Chemistry Tweaks 2015-02-22 15:05:15 -05:00
Markolie 72db213067 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/jobs/job/support.dm
	code/setup.dm
 2015-02-22 19:12:11 +01:00
Markolie 982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
Fox-McCloud edde2d10c6 Dart and Syringegun 2015-02-21 09:54:02 -05:00
Fox-McCloud 2a1028324c Thickmaterial Flag 2015-02-21 07:26:25 -05:00
Markolie 9fedfc7c62 Switch copytext and sanitize proc 2015-02-20 22:17:13 +01:00
DZD d0d6c8eebd Merge with upstream/master 
Fixes merge conflicts.
 2015-02-19 19:38:48 -05:00
ZomgPonies 4be5819122 Merge pull request #339 from Fox-McCloud/Explosives 
Chem Boom Nerf
 2015-02-19 17:39:27 -05:00
Fox-McCloud 6ef9346af7 Flash Powder Fixup 2015-02-18 23:51:54 -05:00
Fox-McCloud 1812a36113 Chem Boom Nerf 2015-02-18 17:13:58 -05:00
DZD 4bcdb94a99 Merge with upstream/master 
Fixes conflicts
 2015-02-18 13:41:32 -05:00
DZD fbd9c367c0 NODROP flag addition & handling 
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
 2015-02-18 13:22:41 -05:00
Mark van Alphen 87ed05c146 Merge pull request #326 from Artorp/AutolatheQueue 
Added queue functionality to the autolathe
 2015-02-18 16:16:05 +01:00
Artorp e1eb2b9a1d Updated m_amt and g_amt to match their design 2015-02-17 18:52:31 +01:00
Markolie f5e2d82953 (Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/machinery/atmoalter/canister.dm
 2015-02-17 02:12:22 +01:00
Markolie 4d8481f83a Merge surgical borgs and crisis borgs 2015-02-16 22:47:55 +01:00
Mark van Alphen 3bc771b15b Merge pull request #314 from Fox-McCloud/Cargo 
Cargo
 2015-02-16 06:52:16 +01:00
Fox-McCloud 1e4d1df880 Merge remote-tracking branch 'upstream/master' into Cargo 2015-02-14 22:02:39 -05:00
Fox-McCloud 0de7e1035c Cargo Supplies 2015-02-14 21:21:09 -05:00
Markolie 49d8ab165a Turn chemistry dispenser beaker in overlay so the constructable dispenser has one 2015-02-14 21:34:14 +01:00
DZD a4cda9287f Merge with upstream/master 2015-02-12 16:43:01 -05:00
ZomgPonies a3716dbea4 Moved fueltankbomb logging from adminlong to attacklog 2015-02-12 02:06:44 -05:00
DZD b3a0c9a975 Removes TABLEPASS and FPRINT flags 
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
 2015-02-10 17:41:37 -05:00
DZD 4e93cc5203 Merge with upstream/maser 2015-02-09 18:22:19 -05:00
DZD 752bd825ac Cling Test, Syringe Changes, Species Edge Cases 
- Syringes take 30 seconds to extract blood, 60 seconds if target is in
a hardsuit, instant if target is user.
- Slime people can no longer be lings.
- Species with NO_SCAN not affected by transform sting.
- Adds reaction between blood and welding fuel. If the blood is normal,
destroys the blood and gives a message, giving a specific message if the
blood belonged to a changeling.
 2015-02-09 13:28:48 -05:00
Markolie 354e569f9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/machinery/rechargestation.dm
 2015-02-09 16:15:00 +01:00
Markolie 7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Markolie d10451c567 Fix a bunch of runtimes 2015-02-09 04:03:20 +01:00
Fox-McCloud 4d89f5b086 Merge pull request #256 from Artorp/MorgueChanges 
Morgue indicator changes
 2015-02-07 12:29:05 -05:00
Artorp 3f77e16fb5 Removed printing delay 2015-02-06 15:07:33 +01:00
Fox-McCloud b975b1e998 Cleanup 2015-02-04 22:57:06 -05:00