Tastyfish
d0a16cb489
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-10-28 19:02:27 -04:00
Tastyfish
6fc9950e45
Gave space cash a proc get_total() to return value of stack, and fixed richest escapee scoreboard line to actually get bank account (was ref'ing phantom var) and get cash amount correctly.
2015-10-28 18:49:14 -04:00
Fox-McCloud
a404929d16
Multiverse Sword
2015-10-21 23:59:59 -04:00
Fox-McCloud
33220548fc
Fixes a Lipstick Runtime
2015-10-18 03:40:21 -04:00
Fox McCloud
d6cb0f9075
Merge pull request #2365 from Crazylemon64/apc_autolathe
...
APC electronics refactor
2015-10-15 16:03:08 -04:00
Crazylemon
3c3f51401b
Cuts out all the old weapon/module code
...
Also lets drones collect intercom electronics, and gives the autolathe
an APC electronics recipe
2015-10-13 21:13:49 -07:00
TheDZD
dd97cc261d
Merge pull request #2343 from Fox-McCloud/game-mode-cleanup
...
Removes Nations and Unused Gamemodes
2015-10-13 21:34:49 -04:00
Fox-McCloud
46f9f68f31
more de-referencing
2015-10-12 04:18:49 -04:00
Fox-McCloud
9795dc761b
Removes Nations and Unused Game Modes
2015-10-11 19:51:19 -04:00
Fox-McCloud
a2db4d118a
why bay and tg why
2015-10-10 09:07:25 -04:00
Fox-McCloud
4c5706bc3a
more...fixes
2015-10-10 08:52:35 -04:00
Fox-McCloud
e17c6bde22
Another del->qdel pass
2015-10-08 16:49:10 -04:00
Fox-McCloud
69d7a7ed1d
Axes Some Pooling
2015-10-08 01:26:15 -04:00
Fox McCloud
18a19df30f
Merge pull request #2292 from tigercat2000/fancy
...
-tg- style inventory update, stripping update
2015-10-06 18:49:08 -04:00
Markolie
bff7a9a80c
Replace _color with item_color
2015-10-05 19:55:14 +02:00
Tigercat2000
8c97846746
-tg- style inventory update, stripping update
...
This commit does the following:
- Updates a few of our inventory procs to -tg-'s latest
- Nukes the equip_e system from orbit
- Fancy UI for stripping people now
- Nuked fucking kitten ears from their snowflakey bullshit update_icons
shitty fuck fuck FUCK
- NUKED FUCKING METAL DETECTORS AHHHHHHHHHHHHHHHHHHHHHHHHHH
2015-10-04 16:53:48 -07:00
TheDZD
8181354ffc
Merge pull request #2261 from Markolie/fixesfixesfixesfixesfixesfixes
...
Fixes
2015-10-02 15:50:23 -04:00
Markolie
e27f84df7d
Dead people can emote!
2015-10-02 03:59:03 +02:00
Markolie
f6903f0152
Alien specific 2
2015-10-01 04:33:58 +02:00
Markolie
bb0bbdcf5a
Alien claws fix
2015-10-01 04:27:59 +02:00
Markolie
d18b18b5b4
Syndicate borg update, add medical syndicate borg, energy sword refactor
2015-10-01 04:21:24 +02:00
Mark van Alphen
25f19dff0d
Merge pull request #2204 from Fox-McCloud/belt-of-holding
...
Ports NT Station's Belt of Holding Sprite
2015-09-29 18:47:17 +02:00
Fox-McCloud
7586390436
Merge pull request #2146 from TheDZD/vision
...
Shadowling, Changeling, and Vision Fixes/Changes
2015-09-29 11:44:06 -04:00
TheDZD
6705006ee7
Merge pull request #2213 from Fox-McCloud/destroy-fixes
...
Fixes a few Destroys
2015-09-28 19:28:29 -04:00
TheDZD
19d8aa3d36
Merge pull request #2215 from Markolie/s2
...
Fix flamethrower logs
2015-09-28 19:03:45 -04:00
DZD
b990b6c71b
Merge remote-tracking branch 'upstream/master' into vision
2015-09-28 19:03:14 -04:00
Markolie
6825c33cb9
Fix flamethrower logs
2015-09-29 00:51:17 +02:00
Fox-McCloud
be672419ca
Fixes a few Destroys
2015-09-28 18:15:39 -04:00
Fox-McCloud
444c616d5a
Ports NT Station's Belt of Holding Sprite
2015-09-27 23:43:41 -04:00
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
DZD
0ceaf664af
Fix merge conflicts
2015-09-27 11:24:51 -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
DZD
0a7f50bbe2
Spelling and sanity fixes
2015-09-23 16:20:06 -04: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
DZD
37ea591087
Shadowling, changeling, and vision fixes/changes
2015-09-23 13:00:58 -04: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
