Commit Graph

20087 Commits

Author SHA1 Message Date
Rob Nelson
a09552f34b Revert "New Nuke Icons, new Medical HUD sprites" 2015-10-06 21:25:02 -07:00
Rob Nelson
192d54f0fb Merge pull request #6006 from PJB3005/anchoring-hacks
Anchors the AI eye.
2015-10-06 20:44:42 -07:00
Rob Nelson
6924c3cdfb Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2015-10-06 20:20:50 -07:00
Rob Nelson
8be01d82c5 Hopefully fix buggy vox num2words shit for good. 2015-10-06 20:20:29 -07:00
dylanstrategie
910dd58fa0 Update CrowbarDestroy and Destroy for all medical scanners 2015-10-07 02:40:11 +02:00
PJB3005
72a9b17ba5 Anchors the AI eye. 2015-10-07 01:52:51 +02:00
clusterfack
5dc006b768 Totally werks this time trust me 2015-10-06 15:10:49 -05:00
Rob Nelson
a5f8d47946 Merge pull request #5954 from clusterfack/optimizingshitagain
Optimizes update_action_buttons
2015-10-06 13:04:14 -07:00
Rob Nelson
42f9277e60 Merge pull request #5999 from DeityLink/mercha
Small fix to Merch Computer transactions
2015-10-06 12:57:04 -07:00
Rob Nelson
df2ab69cf3 Merge pull request #6000 from clusterfack/mommisrfags
Mommis
2015-10-06 12:56:54 -07:00
clusterfack
619c1441af Fagmmis
Fixes literally everything
2015-10-06 14:54:58 -05:00
DeityLink
9b9751848c fix 2015-10-06 21:39:02 +02:00
clusterfack
0f30cb13f5 Fixes pooling bug
Also tests and debugs the new system
2015-10-06 14:28:40 -05:00
Rob Nelson
a4f9c7c32c Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2015-10-06 11:38:27 -07:00
Rob Nelson
9e7d4ecdb5 Borer eggs will check for conditions again after failing to recruit. 2015-10-06 11:38:05 -07:00
clusterfack
59c35f4f6d Runtime 2015-10-06 12:34:55 -05:00
clusterfack
833217ecba Fix/Improve hud elements\\
Fixes #5994
Fixes #5995
2015-10-06 09:39:09 -05:00
clusterfack
e4bb17c56c Fix action buttons being cut off
They have a huge pixel offset which puts them on the screen loc above
2015-10-06 07:39:14 -05:00
clusterfack
65eb45296b 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-06 07:37:18 -05:00
Rob Nelson
280e987881 Merge pull request #5984 from clusterfack/screenlocs
Hud Scaling
2015-10-05 22:59:22 -07:00
Rob Nelson
4200b09464 Merge pull request #5992 from DeityLink/cin
[Bugfix] Finally fixed plant growth overlays
2015-10-05 22:59:11 -07:00
Rob Nelson
ee1cdbc396 Explot fix for borer reproduction. Fixes #5991 2015-10-05 22:55:36 -07:00
DeityLink
969c939dee fixing growth overlays 2015-10-06 07:40:13 +02:00
Rob Nelson
636f3d23fa Merge pull request #5960 from dylanstrategie/Barricade
Re-re-introduce Barricade Revamp
2015-10-05 18:53:40 -07:00
Rob Nelson
d939881714 Merge pull request #5974 from dylanstrategie/Meteors
Update Meteors gamemode
2015-10-05 18:53:29 -07:00
clusterfack
38351c5baa Hud Scaling
Huds now scale with client view.

Exceptions : pretty sure damageoverlay, darkmask, blurry vision which all have unique sprites and dont use screen locs. To fix those we need to use scale() along with a standardized proc for changing view size.
2015-10-05 16:44:35 -05:00
dylanstrategie
54eac294bb Update Wall Shield Gen crate to actually be useful 2015-10-05 22:23:02 +02:00
dylanstrategie
73d001277d Massively reduce chat spam during meteor waves 2015-10-05 22:15:02 +02:00
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