acb55613d4
Better way of calling material and tech name
2015-10-10 12:11:19 +02:00
ec10abc480
Last Few Destroy Fixes
2015-10-10 00:16:31 -04:00
07770fdda7
Merge pull request #2321 from Fox-McCloud/another-del-pass
...
Another del->qdel pass
2015-10-09 18:05:00 -04:00
bfb1744ca6
Merge pull request #2315 from Fox-McCloud/spess-corgi
...
Adds in Corgi Hardsuit
2015-10-09 18:04:52 -04:00
3c72286f2f
Custom_emote now used in place of emote("me")
...
Also fixes some emotes which didn't actually exist for their respective
characters.
Left untouched: Jungle mobs, whatever those are supposed to be.
2015-10-09 13:00:05 -07:00
525953616f
Fixes pet emotes
...
I think I might want to move attack_animal up to mob/living, and add
special cases for the few mobs that need it. Any reason not to?
Also, DNM until I get the chance to test this.
2015-10-08 23:24:04 -07:00
836ddb15d4
Science analyser goggles
2015-10-09 08:22:45 +02:00
27c420d87b
corrects a few del's
2015-10-08 21:22:20 -04:00
692e7524d0
Rigsuit Fixes: Goddamn Goofchem
2015-10-08 15:43:51 -07:00
769a5d3bff
FUUUUUUUUUUUUUUUUUUUUUUUUUUUU
...
Merge conflict EXTREAME FIX
2015-10-08 18:38:45 -04:00
17da3fb732
Hopefully fix character organ-gender issues
2015-10-08 15:23:20 -07:00
b40b4c70cc
no stuttering for noise language
2015-10-08 14:24:58 -07:00
e17c6bde22
Another del->qdel pass
2015-10-08 16:49:10 -04:00
f99152e011
Rigsuit Fixes: Fucking equipping not working
2015-10-08 12:43:30 -07:00
186667456f
Rigsuit Fixes: FUCKING COMPILE YOU PIECE OF SHIT
2015-10-08 12:07:00 -07:00
273745d923
Rigsuit Fixes: Using rig modules while screwed
2015-10-08 11:42:10 -07:00
1de3c2e075
Rigsuit Fixes: Chargecost divided by ten, for reasons I can't fucking understand
2015-10-08 11:41:49 -07:00
7c5d943c92
Rigsuit Fix: Put in hands instead of dropping to floor (if possible)
2015-10-08 11:22:19 -07:00
5c512793b9
Removes the Rest of Pooled Objects
2015-10-08 14:18:40 -04:00
545c38a79b
Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
...
Conflicts:
code/game/objects/items.dm
2015-10-08 11:16:30 -07:00
514a09bf0c
Fixes, Icons
2015-10-08 11:13:48 -07:00
09c0f235e6
Merge pull request #2318 from Fox-McCloud/no-pools-allowed
...
Axes Some Pooling of Specific Objects
2015-10-08 19:28:38 +02:00
178ba25fbb
Merge pull request #2310 from Fox-McCloud/more-destroying
...
More Destroying Tweaks
2015-10-08 19:28:23 +02:00
4ba4434a8e
Merge pull request #2309 from Fox-McCloud/ammo-update-fixes
...
Ammo update fixes
2015-10-08 19:27:52 +02:00
69d7a7ed1d
Axes Some Pooling
2015-10-08 01:26:15 -04:00
1c142b10e1
Adds in Corgi Hardsuit
2015-10-07 17:02:00 -04:00
58253b23ce
ammo tweak
2015-10-07 14:51:14 -04:00
f56f2f43dd
Fixes
2015-10-07 19:39:38 +02:00
b312ff41db
More Destroying Tweaks
2015-10-06 23:29:51 -04:00
18a19df30f
Merge pull request #2292 from tigercat2000/fancy
...
-tg- style inventory update, stripping update
2015-10-06 18:49:08 -04:00
6d978232d5
Merge remote-tracking branch 'upstream/master' into stupid-triggers
2015-10-06 18:25:26 -04:00
d2a80c052c
Merge pull request #2304 from Markolie/paper
...
Fix writing on paper
2015-10-06 17:23:57 -04:00
efcbf98c8d
how did this not commit
2015-10-06 17:19:07 -04:00
623696b985
Ammo Update and Fixes
2015-10-06 17:18:39 -04:00
559b03bfeb
Merge pull request #2297 from Markolie/itemcolor
...
Replace _color with item_color
2015-10-06 16:11:35 -04:00
b15c353028
Remove HIDEJUMPSUIT from plasmamen EVA suit
2015-10-06 08:27:11 -07:00
4fc91429e5
Baystation Rigsuits
...
This commit adds baystation's rigsuit system on top of our own hardsuits;
Our own hardsuits still function fine and are around, but these are
available to admins. Next commit will contain balancing and player
implementation stuff.
2015-10-05 16:42:00 -07:00
755ca6bd3a
Robopen fix, pen language fix
2015-10-06 01:31:12 +02:00
7770fffdf8
Fix writing on paper
2015-10-06 01:22:50 +02:00
9c3e6f1ecd
Removes Update Triggers File
2015-10-05 16:14:38 -04:00
73b2fc122a
Merge pull request #2291 from Markolie/movefix
...
Fixes and pinpointer update
2015-10-05 16:01:02 -04:00
93330288c8
Color updates
2015-10-05 20:13:49 +02:00
13a0595af8
Merge pull request #2294 from Fox-McCloud/cell-gc
...
APC Cell GC Fix
2015-10-05 20:00:22 +02:00
bff7a9a80c
Replace _color with item_color
2015-10-05 19:55:14 +02:00
f9adb09c72
Drone message fix, let robots unbuckle
2015-10-05 19:37:35 +02:00
fdc3578582
Turn poll magic strings into defines
2015-10-05 19:25:05 +02:00
1349a52b10
APC Cell GC Fix
2015-10-05 05:39:22 -04:00
b01792628b
Merge pull request #2279 from Robertha89/patch-1
...
Sudoku via pen
2015-10-05 03:59:38 -04:00
7ff63373b4
Merge pull request #2285 from Fox-McCloud/pooling
...
Ports TG's Datum Pooling
2015-10-05 03:17:43 +02:00
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
Robertha89