Commit Graph

16126 Commits

Author SHA1 Message Date
Zuhayr
e80f59742d Fixes #7316 2014-12-10 00:56:26 +10:30
Amunak
e068d9f8d4 Blast doors' sprite now doesn't disappear when damaged - fixes #7341 2014-12-09 14:50:36 +01:00
Zuhayr
bc394b72d6 Fixes diona and simple_animals eating snacks. 2014-12-09 22:14:41 +10:30
Segrain
4fb83010e1 Fix for #7322. 2014-12-09 14:55:25 +03:00
Segrain
4ae3d3029f Fix for #6643. 2014-12-09 14:54:20 +03:00
Segrain
065d9b110c Fix for #6476. 2014-12-09 14:52:43 +03:00
Zuhayr
79fbc2cde9 Fixes autolathe menu. 2014-12-09 21:32:40 +10:30
Zuhayr
7bc72fb836 Tidied up/fixed up the rig back icons. 2014-12-09 21:01:17 +10:30
Zuhayr
ff2c23714f Bunch of diona nymph tweaks/fixes. 2014-12-09 20:52:41 +10:30
Loganbacca
9fce8921ac Tape fixes
- All paper variants now have taped icon states (might change this to an overlay in future)
- Tape objects inherit overlays from attached papers
2014-12-09 22:53:49 +13:00
Loganbacca
2b98f70f9f Science goggles overlay fix 2014-12-09 22:05:14 +13:00
PsiOmega
239eb2a0e8 Fixes #7323.
pAIs no longer check and cut wires when interacting with radio functionality.
2014-12-09 09:10:49 +01:00
PsiOmega
924955a4c8 Merge remote-tracking branch 'upstream/master' into dev-freeze 2014-12-09 09:07:38 +01:00
Zuhayr
6a8aa48cac Merge pull request #7309 from PsiOmegaDelta/DiscoIsDead
Fixes #7308.
2014-12-09 18:18:21 +10:30
Zuhayr
b44321775e Merge pull request #7276 from mwerezak/poster
Poster fixes
2014-12-09 18:17:46 +10:30
Segrain
4b7b910311 Fix for #7324. 2014-12-09 09:39:05 +03:00
PsiOmegaDelta
f9e59d430b Merge pull request #7329 from mwerezak/talisman
Adds image for cult talismans
2014-12-09 07:26:10 +01:00
mwerezak
ab89ce59dc Merge remote-tracking branch 'upstream/dev-freeze' into poster
Conflicts:
	code/game/objects/effects/decals/contraband.dm
2014-12-09 00:17:22 -05:00
Segrain
a311da90fb Fix for #7330. 2014-12-09 07:39:38 +03:00
Segrain
827a14ca69 Fix for #6649. 2014-12-09 07:37:43 +03:00
Ccomp5950
6ade2b46a0 Merge pull request #7282 from mwerezak/tape-roll
Adds tape rolls to the tool storage spawner list
2014-12-08 20:46:58 -05:00
mwerezak
81890c968e Adds image for cult talismans
So they aren't blank when examined.
2014-12-08 20:45:15 -05:00
Ccomp5950
d8fb78b711 Merge pull request #7326 from Raptor1628/dev-freeze
Hardsuit Fixes
2014-12-08 20:43:56 -05:00
Ccomp5950
0b56714123 Merge pull request #7321 from GinjaNinja32/cryothing
Cryo computer is now walkable.
2014-12-08 20:43:38 -05:00
Ccomp5950
628f040f00 Merge pull request #7318 from sabiram/patch-1
Potentially fixes white sundress
2014-12-08 20:43:25 -05:00
Ccomp5950
4d615fc294 Merge pull request #7271 from Segrain/dev-freeze
Dev-freeze fixes.
2014-12-08 20:40:02 -05:00
Raptor1628
921249a335 Hardsuit Fixes
Should merge now, was missing the .dme. Fixes #7307. Adds helmet cameras
for ERT and nukeops. Fixes incorrect lighting overlays. Fixes a weird
sprite.
2014-12-08 19:12:39 -05:00
GinjaNinja32
362af29cbc Fixes #7320 2014-12-08 20:11:07 +00:00
sabiram
b27adda1c3 Potentially fixes white sundress 2014-12-08 14:30:03 -05:00
GinjaNinja32
eb2a62c11b Fix virologists spawning without jumpsuits, IDs or PDAs. Fixes #7312. 2014-12-08 18:48:14 +00:00
PsiOmega
887e2c3abf Fixes #7308.
Adds missing parent call in Del().
2014-12-08 18:20:39 +01:00
PsiOmega
4d6d74b859 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/machinery/portable_turret.dm
2014-12-08 17:37:42 +01:00
PsiOmega
87998f7eb1 Fixes #7295.
Cleans up round end summary.
Removes duplication of traitor summaries.
Attempts to improve how the traitor purchase log is presented.
Ghosts made manifest now have different names and assignments, otherwise one would get messages like "Anguished Phantom played as an Anguished Phantom".
Instead the message is "Anguished Phantom played as a Manifest Ghost".
2014-12-08 17:06:36 +01:00
Zuhayr
a2d3a0055e Fixes #7301 2014-12-09 02:35:46 +10:30
Mloc
efe78df3ff Merge pull request #7299 from Loganbacca/freezefix
Fixes omni-filters not working
2014-12-08 13:17:36 +00:00
Loganbacca
92c81aa958 Fixes omni-filters not working 2014-12-09 01:15:10 +13:00
Mloc
83f2a5ba5a fix some misplaced set_dir()s
fixes part of #7284
fixes #7288
fixes one of #7287

Signed-off-by: Mloc <colmohici@gmail.com>
2014-12-08 10:09:09 +00:00
Segrain
7f1b5f0603 Fix for #7285. 2014-12-08 11:20:46 +03:00
PsiOmegaDelta
e66f5ed765 Merge pull request #7272 from Raptor1628/dev-freeze
Hardsuit Mark Two, more Hulabaloo
2014-12-08 06:45:11 +01:00
mwerezak
d506eca89a Adds tape rolls to the tool storage spawner list 2014-12-08 00:15:27 -05:00
mwerezak
f9564cbe5e Poster fixes
Fixes #7261
Fixes placed posters being visible on both sides of the wall.
Fixes the poster_type var used to specify certain poster designs on the
map not working correctly, and makes the nuke op shuttle poster an
actual poster.
Poster placement now belongs to the poster object instead of turf/simulated/
Posters can now be placed on unsimulated and shuttle walls.
2014-12-07 22:30:08 -05:00
Zuhayr
3c66bd3920 Merge resolution. 2014-12-08 13:01:04 +10:30
Raptor1628
75659ab66a Hardsuit Mark Two, more Hulabaloo
Adds all sprites for the nukeop and research hardsuit. Shuffles around
hardsuit spawns and gear so they make sense, especially for the ERT,
they still only have two hardsuits per department, but there are enough
magboots and vests for the people who need the regular armor. Added the
medical hardsuit and its attendant gear to the station hardsuit list.
Added all of the xenoarch gear to the hazmat hardsuit for Zuh. Moves
some suit storage things around as they were lost somewhere along the
way since I committed them. Moves the Hazard Suit custom item over to
hardsuit code to prep for them being buildable on station at some point.
For now has the same stats as a voidsuit, no modules, just drains power
and has some extra pretty sprites. Sending this over to dev freeze
because most of it is required for hardsuits to be nice and pretty for
master. Now compatible with latest fixes.
2014-12-07 21:25:08 -05:00
Segrain
e0ab31756d Fix for double definition. 2014-12-08 04:01:00 +03:00
Segrain
639c61721b Fix for #7261. 2014-12-08 03:58:42 +03:00
Segrain
aa575b446a Fix for #7260. 2014-12-08 03:57:02 +03:00
Ccomp5950
b4becaa587 Merge pull request #7264 from Zuhayr/master
Fixes, death refactor.
2014-12-07 19:38:21 -05:00
Zuhayr
b556609e27 Replaces some macros. 2014-12-08 10:34:36 +10:30
PsiOmegaDelta
5b6d3ab55a Merge pull request #7263 from mwerezak/hydrotray
Fixes atoms with no flags set being walkable
2014-12-07 22:06:10 +01:00
PsiOmegaDelta
79cd5f6430 Merge pull request #7251 from Loganbacca/implantfix
Implant fixes/cleanup
2014-12-07 22:05:14 +01:00