TheDZD
0604c8d16e
Merge pull request #2325 from Aurorablade/ForTheSwarm2
...
Fethas Carnival of Horrors part 1.5: Swarmers
2015-11-03 19:20:08 -05:00
Tastyfish
91c31ceda7
fixed typos and inconsistencies in sign descriptions.
2015-11-02 00:30:06 -05:00
Aurorablade
1404c88229
fixes
...
will still need to look at using transfer_to and the language key
2015-10-19 08:27:06 -04:00
Aurorablade
3a2590261b
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into ForTheSwarm2
2015-10-18 21:37:28 -04:00
TheDZD
d681cefa03
Merge pull request #2362 from Fox-McCloud/gc-everything
...
Garbage Collect Everything
2015-10-18 16:44:35 -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
Aurorablade
d141945b10
Changed based on feedback
2015-10-13 23:01:28 -04: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
e60edf9345
Garbage Collect Everything
2015-10-13 20:23:26 -04:00
Aurorablade
2b54e5cf63
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into ForTheSwarm2
2015-10-11 22:50:27 -04:00
Fox-McCloud
9795dc761b
Removes Nations and Unused Game Modes
2015-10-11 19:51:19 -04:00
Tigercat2000
ccdae149bb
-tg- pull refactor
...
This commit does the following:
- Overhauls how pull works. It is now based on a mob verb,
mob/verb/pulled()
- Makes the pull icon much more responsive. It is now updated whenever a
mob starts or stops pulling an object, and instantly updates.
- This required HUD changes. God help me.
2015-10-10 11:15:52 -07:00
Fox-McCloud
a96375a54e
more del to qdel
2015-10-09 17:14:49 -04:00
Aurorablade
769a5d3bff
FUUUUUUUUUUUUUUUUUUUUUUUUUUUU
...
Merge conflict EXTREAME FIX
2015-10-08 18:38:45 -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
559b03bfeb
Merge pull request #2297 from Markolie/itemcolor
...
Replace _color with item_color
2015-10-06 16:11:35 -04:00
Markolie
bff7a9a80c
Replace _color with item_color
2015-10-05 19:55:14 +02:00
Markolie
b24f5ff979
Fixes and pinpointer update
2015-10-05 00:26:43 +02:00
Markolie
52d4135648
Ambulance/movement fixes
2015-10-03 21:33:40 +02:00
TheDZD
297cc55fa7
Merge pull request #2255 from Markolie/alarm
...
Add alarm sound to display case
2015-10-02 15:50:27 -04:00
TheDZD
de8e5ecfd0
Merge pull request #2254 from Markolie/swordnborg
...
Syndicate borg update, add medical syndicate borg, energy sword refactor
2015-10-02 15:49:57 -04:00
Fox McCloud
62d25caec7
Merge pull request #2252 from tigercat2000/atommovablebuckling
...
Move buckling to /atom/movable, can now buckle to mobs if adminbooze
2015-10-01 19:01:39 -04:00
Mark van Alphen
b004303cf6
Merge pull request #2245 from Fox-McCloud/ZAS-Is-Dead
...
And So Dies ZAS
2015-10-01 19:27:22 +02:00
Markolie
66637854f1
Derp
2015-10-01 05:21:20 +02:00
Markolie
fae54dbd0d
Up the volume
2015-10-01 05:17:13 +02:00
Markolie
ca05be7536
Add alarm sound to display case
2015-10-01 05:16:26 +02:00
Markolie
d40cfe582e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into swordnborg
...
Conflicts:
icons/obj/surgery.dmi
2015-10-01 04:32:10 +02:00
Markolie
d18b18b5b4
Syndicate borg update, add medical syndicate borg, energy sword refactor
2015-10-01 04:21:24 +02:00
Tigercat2000
575362b0f4
Move buckling to /atom/movable, can now buckle to mobs if adminbooze
...
Also changed:
- Comment clarifying what buckle_lying = -1 means
- Changes direction of lying on operating tables, somehow missed it
2015-09-30 15:29:47 -07:00
Crazylemon
aaaaa14ae8
Fixes the misplaced quote
...
Does not fix: How tired I am
2015-09-30 08:05:34 -07:00
Crazylemon
d925ee8a10
Fixes the syntax errors and is more consistent with messages now
2015-09-30 07:59:29 -07:00
Crazylemon
6c5a643944
Fixes the roller_holder to work again
...
After the buckling rehaul, the roller holder couldn't unbuckle patients
nor collapse/collect beds. This should readd that functionality.
2015-09-30 01:42:35 -07:00
Fox-McCloud
3236fa8be5
And So Dies ZAS
2015-09-30 02:00:39 -04:00
Mark van Alphen
603a77bc3d
Merge pull request #2218 from Fox-McCloud/safe-cleanup
...
Safe Cleanup and Fix
2015-09-29 21:55:07 +02:00
Fox-McCloud
62fb3c2981
Safe Cleanup and Fix
2015-09-29 11:31:57 -04:00
Tigercat2000
ec2b31e435
Nuke wheelchair snowflake shit, fix the delay
2015-09-28 12:59:44 -07:00
Markolie
699bbd0972
Compile
2015-09-28 07:46:30 +02:00
Markolie
3397ddf7c1
Fix inflatable walls
2015-09-28 07:41:24 +02:00
Markolie
f7fe8c8c6f
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes3
...
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
2015-09-28 03:05:04 +02:00
Fox-McCloud
d7f23f4271
Oh, that kind of list
2015-09-27 19:39:09 -04:00
Fox-McCloud
155afc6131
lists
2015-09-27 19:24:35 -04:00
Markolie
b914544a87
Fixes
2015-09-27 22:50:09 +02:00
Markolie
69f71268b8
Stop AI's from going into transit tubes
2015-09-27 03:38:22 +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
