Commit Graph

20270 Commits

Author SHA1 Message Date
dylanstrategie
52458706d4 Rename helper proc 2015-10-05 09:31:49 +02:00
Rob Nelson
dd6285a123 Merge pull request #5961 from PJB3005/OH-GOD-I-BLEW-IT
Fixes the gas filters.
2015-10-04 23:55:43 -07:00
dylanstrategie
bd313413e3 Update Meteors gamemode 2015-10-05 08:54:30 +02:00
Rob Nelson
ba01181c83 Merge pull request #5897 from unid15/cheetos
Slot machines v2.0
2015-10-04 23:53:16 -07:00
Rob Nelson
624845d2fe Merge pull request #5866 from unid15/maus_port
Allows picking up all tiny animals
2015-10-04 23:52:35 -07:00
Rob Nelson
0461eacb00 Merge pull request #5950 from Shadowmech88/Lawgiver2
Lawgiver
2015-10-04 23:52:03 -07:00
clusterfack
5fde3bf0d6 Merge pull request #5957 from PJB3005/the-dview-slams-into-the-wall!
Should fix the dview being affected by ZAS.
2015-10-04 21:57:11 -05:00
clusterfack
0fcded0d8a Merge pull request #5959 from dylanstrategie/Wheelchair-Gravity-Fix
Fix Wheelchair Gravity stuff
2015-10-04 21:54:43 -05:00
Rob Nelson
b24d319cdd Possibly fix #5958 2015-10-04 18:51:09 -07:00
dylanstrategie
2143e65741 Barricades are no longer airtight, barricade kits no longer bash windows and airlocks 2015-10-05 03:02:40 +02:00
PJB3005
5e08bc20a8 OH GOD 2015-10-05 02:35:53 +02:00
dylanstrategie
fa615ead9d Re-re-introduce Barricade Revamp 2015-10-05 02:11:22 +02:00
dylanstrategie
6ab078d962 Fix Wheelchair Gravity stuff 2015-10-05 01:46:37 +02:00
PJB3005
53aeb4c9fe Should fix the dview being affected by ZAS.
Fixes #5955
2015-10-04 23:15:56 +02:00
unid15
807d1fa8b6 adds missing qdels 2015-10-04 20:55:59 +02:00
unid15
a22a3e5983 more cooking machine improvements 2015-10-04 20:44:46 +02:00
unid15
a611de7a25 allows picking up tiny animals
better_code

changelog

changelog, tweaks

last changes

makes cooking machiens work better

fuck

more friendly code

fix for custom food names

small animals can't escape automatically
2015-10-04 20:29:54 +02:00
clusterfack
9785306923 Optimizes update_action_buttons
Shaves off another ~10% of human life() I'd say.

How it works right now:
Makes a new image of the action object from its icon state and icon.
Blends it with the obj/screen button.
For up to 5 objects, every tick.

How it works after I optimized it:
Makes a new image once, sets its appearance to that of the action object (costless)
Since the image's loc is the obj/screen button it requires no blending
Does nothing else because my system isn't shit
2015-10-04 11:55:35 -05:00
unid15
d9d2f2c90d fixes being unable to reclaim money after winning jackpot 2015-10-04 17:49:58 +02:00
unid15
eb17450649 removes stupid 2015-10-04 17:42:41 +02:00
Unfit
fbcf676ee9 playable 2015-10-04 17:14:37 +02:00
Unfit
624c4d0f55 slot machines 0.1 2015-10-04 16:35:03 +02:00
Shadowmech88
8ef2f8ab64 Reverting girder changes. 2015-10-04 05:31:09 -05:00
Shadowmech88
99c1a78f4c Added the lawgiver.
Slightly increased the chance for light explosion damage to destroy girders.
2015-10-04 04:35:02 -05:00
Rob Nelson
d023d2cfb9 Merge pull request #5732 from DeityLink/paintings
[Content] Merch Computer revamp and Paintings
2015-10-04 00:30:23 -07:00
DeityLink
65874499db Merch Computer Revamp and Paintings 2015-10-04 09:27:40 +02:00
Rob Nelson
283336cf62 Merge pull request #5816 from Faptastic/Bleeding-Edge
Spliced virus samples now get their own entry in the database after ejection.
2015-10-04 00:11:52 -07:00
Rob Nelson
ae5c831252 Merge pull request #5931 from Repth1/Bleeding-Edge
New Nuke Icons, new Medical HUD sprites
2015-10-04 00:10:07 -07:00
Rob Nelson
1690b0e199 Merge pull request #5948 from clusterfack/poolingstrikesagain
Probably fix boo icon
2015-10-04 00:08:42 -07:00
clusterfack
50a22a3b4e Merge pull request #5947 from DeityLink/ethereal
Ethereal fixes
2015-10-04 02:03:59 -05:00
clusterfack
106706655f Probably fix boo icon
Spell screen objects weren't being removed from client screen after being pooled
2015-10-04 02:00:40 -05:00
DeityLink
42e2c8b4ab RAAAAARRRGGHHH 2015-10-04 08:51:50 +02:00
DeityLink
087530a815 ethereal fixes and changelog 5947 2015-10-04 08:47:01 +02:00
Rob Nelson
681bfb7127 Fix borers dying to plasma gas. I am dumb. 2015-10-03 23:11:34 -07:00
clusterfack
e7f232fde0 Merge pull request #5944 from DeityLink/shadow
Fixes #4314
2015-10-04 00:25:38 -05:00
DeityLink
ea95ed29c5 changelog 5944 also fixes #4314 2015-10-04 07:21:34 +02:00
Rob Nelson
5623ff2ed4 Fixes #5902 2015-10-03 20:35:28 -07:00
Rob Nelson
e5bdf502d1 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into borer-fixes
# Conflicts:
#	maps/tgstation.dmm
2015-10-03 20:13:00 -07:00
Zth
98184d9334 1 single line + chlog 2015-10-04 00:11:03 -03:00
Rob Nelson
04ab5a0610 Merge pull request #5941 from Probe1/ERT+Lightbulb_Fixes
ERT, Lighting map fixes
2015-10-03 20:10:55 -07:00
Rob Nelson
b7e6f58f5f Merge pull request #5933 from dylanstrategie/Handicap
Unfuck external organs, hopefully
2015-10-03 19:00:57 -07:00
Rob Nelson
d05f7b5b4c Plasma setup for box, fixed egg hatching
Fixes #5937
2015-10-03 18:56:27 -07:00
Rob Nelson
213c0902fd Reshuffle unlockable chems (#5937 item 3) 2015-10-03 15:44:57 -07:00
Rob Nelson
b7aecaa6d6 Borer fixes (#5937 1&2) - Unlocks are part of borers rather than a global list. (TODO) 2015-10-03 14:52:51 -07:00
Probe1
d4089f04e3 Changes ERT Landmark to "ERT" from "Commando" which it shared with Death Squad.
Adds ERT Landmarks to the ready room for ERT on Meta and Box.
2015-10-03 16:55:03 -04:00
dylanstrategie
dda34ea123 Span fix 2015-10-03 20:02:46 +02:00
Rob Nelson
de657d1afb Merge pull request #5936 from unid15/master
Fixes bugs and beartraps
2015-10-03 10:46:04 -07:00
unid15
b2035a7b45 beartrap fixes 2015-10-03 19:41:47 +02:00
PJB3005
9cdef18d5f Fixes icons for passive vents and mirrored gas filters. 2015-10-03 18:38:28 +02:00
unid15
2cf7587ee6 more fux 2015-10-03 18:26:10 +02:00