mwerezak
229f4cb043
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color
...
Conflicts:
code/modules/customitems/item_defines.dm
2015-04-26 02:04:59 -04:00
mwerezak
b20f604d0c
Adjusts threshold for limb removal due to damage
2015-04-26 01:58:52 -04:00
Zuhayr
79e3acc95e
Finalized wall refactor.
2015-04-26 12:58:57 +09:30
Zuhayr
dbf8e53020
Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores.
2015-04-26 12:53:26 +09:30
Zuhayr
12cb60daa3
First pass on wall refactor/mining changes.
2015-04-26 12:53:03 +09:30
Daranz
dd02f9e9f0
Fix cell charger icon not updating when cell taken out by a borg
2015-04-25 19:38:47 -04:00
Chinsky
3e3b772a13
Merge pull request #8926 from Yoshax/loadoutpoints
...
Adjusts custom loadout item prices.
2015-04-26 00:48:39 +03:00
Chinsky
f48b9be16b
Merge pull request #8974 from mwerezak/balaclava
...
Fixes balaclava sprite sheets
2015-04-26 00:46:06 +03:00
volas
53a95d8eff
Fixes #8913
2015-04-25 22:43:50 +03:00
mwerezak
78a02c705b
Removes unnecessary and out of place item dropping in human icon code.
2015-04-25 13:55:47 -04:00
mwerezak
4829f1d82d
Adds calls to mob_can_unequip() where appropriate
2015-04-25 13:55:24 -04:00
mwerezak
3a00fce32b
Refactors mob_can_equip(), adds unequip checks
2015-04-25 13:54:59 -04:00
PsiOmega
4a35631af1
Attempts to save Yosh's code.
2015-04-25 16:39:09 +02:00
PsiOmega
d7bbc6f1c3
Makes it possible to define custom ambiance music for holodeck programs.
...
Cleans up holodeck code. Revives an old SS13 track, THUNDERDOME!
2015-04-25 10:53:14 +02:00
mwerezak
4d9586ecae
Fixes balaclava sprite sheets
2015-04-25 02:55:04 -04:00
mwerezak
e50043fe99
Updates a few mask body cover flags, allows breath masks to be adjusted in hand
2015-04-24 22:00:51 -04:00
mwerezak
5fed768053
Fixes rounding in returned vector locations
...
Fixes a rounding issue in returned vector location that would cause
returned projectile trajectories to be biased towards the lower left
corner of the map.
2015-04-24 17:58:50 -04:00
Zuhayr
173329f675
Merge pull request #8968 from Jarcolr/signed
...
Adds 9 new bar signs.
2015-04-25 03:09:35 +09:30
PsiOmega
1fea589ad7
Merge remote-tracking branch 'upstream/dev' into TheSummoning
...
Conflicts:
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02:00
PsiOmega
e7d85f8edc
Adds Destroys.
2015-04-24 17:11:14 +02:00
Jarcolr
28c037b6ce
Adds 9 new bar signs.
2015-04-24 17:35:07 +03:00
PsiOmega
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmegaDelta
ee88da4cea
Merge pull request #8966 from Baystation12/master
...
Dev
2015-04-24 09:20:16 +02:00
Chinsky
60e7aacf79
Merge pull request #8951 from Dennok/patch-15
...
floorlayer
2015-04-24 10:04:29 +03:00
Chinsky
e0da322ee3
Merge pull request #8956 from mwerezak/gametime
...
Makes crit oxyloss and malf AI timer run in gametime instead of realtime.
2015-04-24 10:03:06 +03:00
Chinsky
2159045b81
Merge pull request #8879 from Dennok/patch-6
...
Fix speed and add rotate()
2015-04-24 10:01:13 +03:00
Zuhayr
24175051a2
Merge pull request #8961 from mwerezak/limb-augments
...
Fixes Snapwalk's Limb Augment item being removable through the inventory panel
2015-04-24 16:15:16 +09:30
Daranz
12a6797723
Add renaming of things (papers, etc.) in folders
2015-04-23 21:49:56 -04:00
Daranz
1bd25c54e3
Add random access inserting into paper bundles
...
You can now insert papers into paper bundles by clicking on the next page or
previous page link with a sheet of paper in hand.
The bundle window also now correctly updates when the bundle is in a folder.
2015-04-23 21:49:56 -04:00
mwerezak
0a7fd34f3f
Limb augments no longer prevent putting on jumpsuits
2015-04-23 11:27:16 -04:00
Daranz
ad51379d86
Make papers in a clipboard renameable without removing
2015-04-23 08:48:52 -04:00
mwerezak
7a6a54b671
Fixes Snapwalk's Limb Augment item being removable through the inventory panel
...
I haven't heard of any issues on the server about this, but it's probably best to prevent them from being removed.
2015-04-23 08:25:49 -04:00
mwerezak
f86642a74e
Updates clothing/under to use item_state_slots.
...
Also fixes a lot of incorrect jumpsuit item_state values.
2015-04-23 08:03:40 -04:00
PsiOmega
b9f8b0b8aa
Re-shuffles huma/say(). Removes non-existing map variables.
2015-04-23 13:36:13 +02:00
PsiOmega
eee67109d1
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/say.dm
2015-04-23 13:15:43 +02:00
PsiOmega
2aa9a70496
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-04-23 12:59:47 +02:00
Zuhayr
f06326556a
Merge pull request #8838 from Dennok/patch-5
...
Pipelayer
2015-04-23 20:03:20 +09:30
Dennok
dfa0735c1d
Remove .contents in loop.
2015-04-23 11:59:34 +03:00
mwerezak
3acfe5960e
Renames inventory slot string key defines
2015-04-23 04:57:03 -04:00
mwerezak
7a8ae91c6a
Makes crit oxyloss and malf AI time run in gametime instead of realtime.
2015-04-23 04:42:58 -04:00
Zuhayr
c7ec25e8f8
Merge pull request #8855 from comma/soundenv
...
Sound environments
2015-04-23 17:04:30 +09:30
Zuhayr
3fc9260187
Merge pull request #8954 from GinjaNinja32/diona_speech
...
Fixes dionaea always using the verb "says".
2015-04-23 17:02:20 +09:30
mwerezak
1bbb19297e
Implements item_state overrides for back slot, hands
...
Updates backpacks to use the item_state overrides where necessary, fixes #8577
2015-04-23 03:26:18 -04:00
GinjaNinja32
07cc28af8e
Fixes dionaea always using the verb "says".
...
Not sure why, but speech_problem_flag is being set to 1 for dionaea, and only dionaea.
Fixes #8952
2015-04-23 08:03:07 +01:00
Chinsky
392cc1b0bb
Merge pull request #8938 from GinjaNinja32/floorpainter
...
Fixes floor painter white-bot and white-delivery states
2015-04-23 09:20:13 +03:00
Chinsky
df21e9fc2e
Merge pull request #8921 from PsiOmegaDelta/DirtyEngineers
...
Shower curtains no longer lose their default color upon being washed.
2015-04-23 07:34:44 +03:00
Chinsky
71ffa782c4
Merge pull request #8914 from PsiOmegaDelta/BadMove
...
Ensures new players cannot ghost by moving.
2015-04-23 07:34:34 +03:00
Chinsky
6cc8be6d90
Merge pull request #8936 from Dennok/patch-14
...
Automatic CableLayer
2015-04-23 07:34:00 +03:00
mwerezak
5b037670b3
Removes most instances of item_color
...
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
2015-04-22 17:40:27 -04:00
mwerezak
94c9b9b8ca
Adjusts glove siemen coefficients
...
Also adjusts jumpsuit rolling to be more amenable to future changes.
2015-04-22 16:46:14 -04:00
