Markolie
dbbdf90670
Add missing c200 cash sprite
2015-09-28 05:03:19 +02:00
Mark van Alphen
48a3d1ab9a
Merge pull request #2176 from Fox-McCloud/janicarts-and-janitors
...
Janicart and Janitor Update
2015-09-28 03:02:04 +02:00
Fox-McCloud
d7f23f4271
Oh, that kind of list
2015-09-27 19:39:09 -04:00
Fox-McCloud
569758f4cb
bluespace trashbag
2015-09-27 06:46:50 -04:00
Robertha89
495a5bfe31
Death Alarm Implant Kit change
...
Add's a sixth implant, and removes the implantpad, as it is not needed for deathimplants.
2015-09-26 19:29:48 +02:00
Fox-McCloud
4413911688
Janicart and Janitor Update
2015-09-26 06:17:29 -04: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
Markolie
e96103a02b
Fluff item clean-up
2015-09-25 04:31:30 +02:00
Tigercat2000
4f3938d68b
-tg- buckling system
...
This commit overhauls a bunch of systems so that buckling works for
any subtype of /obj. This means that space vines and chairs and beds all
use the same system. A lot of stuff has been touched.
2015-09-24 15:52:10 -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
Markolie
b770e8f2a0
Implant fixes/updates
2015-09-23 02:51:33 +02:00
Fox-McCloud
71001cc5ea
Changes a Chemistry Transfer Proc
2015-09-22 05:56:49 -04:00
Fox-McCloud
3777639425
Fixes Utensil Feeding
2015-09-19 05:14:25 -04:00
TheDZD
268992a32f
Merge pull request #2081 from Fox-McCloud/borg-update
...
Borg Update: MMI and Suits
2015-09-18 22:31:21 -04:00
Fox-McCloud
56ed8c1a7e
Pass III
2015-09-18 21:15:08 -04:00
Fox-McCloud
74565c101b
Fixes up a few Destroys
2015-09-18 04:20:02 -04:00
Fox-McCloud
b01d49d72c
Borg Update: MMI and Suits
2015-09-17 06:50:24 -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
02921fea74
Merge pull request #1971 from Regen1/mechweapons
...
Mech weapons spawn in lockboxes framework
2015-09-16 21:17:27 +02:00
Mark van Alphen
feff96184a
Merge pull request #2061 from Fox-McCloud/handbiting
...
Removes Handchewing While Cuffed
2015-09-16 20:23:14 +02: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
311cd79e5c
More Grenades
2015-09-16 00:00:07 -04:00
Fox-McCloud
9ca7d1002d
one last grenade
2015-09-15 21:48:53 -04:00
Markolie
5564f3da5b
Add missing variables
2015-09-16 03:37:51 +02:00
Markolie
0741669bd6
Implement remove_item_from_storage properly, syndi toolbox tool color update
2015-09-16 01:54:34 +02:00
Markolie
2098933ee4
welding_fuel fix
2015-09-16 01:37:51 +02:00
Markolie
0db98340f8
Further welding tool updates
2015-09-16 01:37:07 +02:00
Markolie
951b58af5a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawstate
...
Conflicts:
code/game/objects/items/weapons/tools.dm
2015-09-16 01:32:33 +02:00
Markolie
aeabab7248
Welding tool refactor, in-hand updates
2015-09-16 01:27:15 +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
37b215c8f2
Removes Handchewing While Cuffed
2015-09-15 07:38:24 -04:00
Fox-McCloud
844d203d0e
cleanup and restructure
2015-09-15 06:52:06 -04:00
Fox-McCloud
ff265d95d3
re-adding old grenades
2015-09-15 01:20:13 -04:00
Mark van Alphen
1539a4d1e8
Merge pull request #2041 from Fox-McCloud/backpacks
...
Backpack Storage Rework
2015-09-15 06:58:44 +02:00
Fox-McCloud
3e0a6d286d
tweaks
2015-09-15 00:12:41 -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
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
1e1c667ad5
Backpack Storage Rework
2015-09-13 23:22:09 -04:00
Markolie
2cf27f9255
Get rid of two obsolete overrides
2015-09-13 23:03:16 +02:00
Markolie
ca6c7d10ba
In hand sprite overhaul
2015-09-13 22:44:18 +02:00
Markolie
aaeac981b9
Temperature gun update
2015-09-13 21:05:23 +02:00
Fox-McCloud
25c35343dc
materials-consitency
2015-09-12 16:22:39 -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
Mark van Alphen
69139c1bef
Merge pull request #1993 from Fox-McCloud/rad-laser-fix
...
Rad Laser Fix
2015-09-10 01:14:38 +02:00
Fox-McCloud
d70c166109
Rad Laser Fix
2015-09-09 17:00:53 -04:00
Fox-McCloud
71f6b312d8
tweak
2015-09-08 22:01:05 -04:00
Fox-McCloud
1c6c733a52
Nuke Ops and Traitor Update+Balance
2015-09-08 19:38:30 -04:00
