Commit Graph

482 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
8be01d82c5 Hopefully fix buggy vox num2words shit for good. 2015-10-06 20:20:29 -07:00
Rob Nelson
a5f8d47946 Merge pull request #5954 from clusterfack/optimizingshitagain
Optimizes update_action_buttons
2015-10-06 13:04:14 -07: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
d939881714 Merge pull request #5974 from dylanstrategie/Meteors
Update Meteors gamemode
2015-10-05 18:53:29 -07:00
dylanstrategie
52458706d4 Rename helper proc 2015-10-05 09:31:49 +02:00
dylanstrategie
bd313413e3 Update Meteors gamemode 2015-10-05 08:54:30 +02: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
PJB3005
53aeb4c9fe Should fix the dview being affected by ZAS.
Fixes #5955
2015-10-04 23:15:56 +02: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
Repth
d1c0d85236 -50 not 50 2015-10-02 21:31:30 +01:00
Repth
753e37f3f6 MedicalHUD QoL changes, more readable and less head blocking top bar, smaller icons to not interfere with speech bubbles, no bar when at full health, faster flashing state at -50 to -99 health. http://i.imgur.com/gwdXDYo.png 2015-10-02 21:21:13 +01:00
Rob Nelson
3177e34271 Merge pull request #5895 from Unfit/mammamia
fixes
2015-09-30 11:00:59 -07:00
unid15
0e8c9c1311 at last 2015-09-29 20:43:44 +02:00
PJB3005
6d892e0d8a DOUBLE FUCK 2015-09-29 04:00:33 +02:00
PJB3005
42f483ddf9 FUCK
FUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCKFUCK
2015-09-29 03:58:20 +02:00
unid15
c39e98e3e9 fucking blulshit 2015-09-28 21:23:22 +02:00
PJB3005
c7c9613b07 Unifies pooling. 2015-09-26 16:27:27 +02:00
Rob Nelson
d06af93a29 Fix research tree
All functions tested and working.
2015-09-18 01:35:48 -07:00
DeityLink
962568a2c2 Experimental Guns No5. Nikita 2015-08-24 00:27:57 +02:00
D3athrow
efbbd98ebb spell fixes 2015-08-22 16:04:58 -05:00
D3athrow
6dfe7c3dff reduce proc calls 2015-08-22 13:40:22 -05:00
DeityLink
c07c053e03 cult logs 2015-08-19 16:01:19 +02:00
PJB3005
1d92fdc376 Fixes ceil, as such, fixes Eguns. 2015-08-18 17:29:27 +00:00
ComicIronic
7c09b659cd Multi-layer piping
Pipes and pipe items now have a pipe_layer var which controls which layer they're on.
Current pipes now only connect to other pipes on the same layer as them, and it is possible to stack multiple pipes on a tile.
The layer of a pipe item can be changed by using a pipe planner, aligning with a built pipe using the RPD or a pipe item, or setting the alignment on the pipe dispenser.
Added the isConnectable() proc for OOP way of checking if two pipes can do the do.
Added the layer manifold - this pipe has 5 connectors on one side, and one on the other. It acts as a layer converter.
Pipes change their pixel_x and pixel_y according to their pipe layer.
2015-08-17 19:23:07 +00:00
Rob Nelson
d8a7173a92 Fix some performance issues on startup. 2015-08-16 18:35:42 -07:00
Rob Nelson
2347d5ac12 Merge branch 'Bleeding-Edge' of gitlab.com:vgstation/vgstation into Bleeding-Edge 2015-08-16 15:15:55 -07:00
D3athrow
196aa9c366 keep rogue process from hanging scheduler. 2015-08-16 17:13:26 -05:00
Rob Nelson
5149e76f60 get_z_level funtime eradication. (get_z_level() can return null now) 2015-08-16 15:11:03 -07:00
D3athrow
c3a9905811 Like wizards n shit, zap mothafucka 2015-08-15 22:45:37 -05:00
PJB3005
9d7ff729b6 Atom locking 2015-08-15 15:06:04 +02:00
PJB3005
9aaa3dd038 Ports Mloc's latest optimizations 2015-08-14 01:52:30 +00:00
Unfit
8e63fec2a8 remove sillyness
reject_bad_name( replaces sanitize(stripped_input(
plating added to the list of bad names
2015-08-13 05:45:18 +00:00
unid15
6c4d0add75 SHUTTleS 2015-08-06 16:59:13 +00:00
PJB3005
3bc5d86263 LIGHTING IS BACK.
AND A SHITLOAD FASTER.

SANIC.
2015-07-21 14:16:27 +02:00
D3athrow
cf333c09e7 FFUUUUUUUUUUUUUUUUUUUUUUUUUUUUCCCKKK 2015-07-20 16:04:58 -05:00
D3athrow
d59f6a07b0 comment out panicwriter and saytesting 2015-07-20 16:04:48 -05:00
D3athrow
f545aed710 fix dem crashums 2015-07-19 11:22:55 -05:00
D3athrow
7a3ff4efc3 THE LIGHTING IS DEAD, LONG LIVE DAL 2015-07-18 23:05:18 -05:00
D3athrow
41d7df01fd just fuck my shit up 2015-07-18 02:30:51 -05:00
d3athrow
471efb29a1 Merge pull request #5281 from PJB3005/just_what
Removes setLoc(), a retarded piece of code
2015-07-15 11:14:21 -05:00
clusterfack
523e1eaf24 Merge pull request #5342 from clusterfack/FUCKYOUSAYLAGGYSAYCODE
SHOVE IT IN ONII-SAMA
2015-07-14 18:28:42 -05:00
clusterfack
53b4182eef Optimizes Say
I dunno make say code faster or something
2015-07-14 16:20:52 -05:00
clusterfack
e4084756dc Add midnight rollover to station time
Fixes #5329
2015-07-13 14:27:10 -05:00
PJB3005
decf441d75 Why was N3X15 one of our head coders again? 2015-07-07 15:58:10 +02:00
clusterfack
82acb92f1a Runtimes
Fix two old as shit runtimes, one that occurs on every local server involving making a random name. The other coming from my recent removal of call() from client/move, istype is being called upon the object instead of the variable which isn't blocking other types.
2015-07-05 21:09:25 -05:00
d3athrow
32bd239298 Merge pull request #5226 from clusterfack/thingy
Various small optimizations
2015-07-05 12:01:52 -05:00
clusterfack
ee1d271894 Various small optimizations
Makes mobs gibbed or dusted not force del and also makes the atom/movable/overlays they use for their death animation not force del.

Also removes the call() from client/move because WHY THE FUCK was it there.
2015-07-05 02:06:19 -05:00
D3athrow
5f2992c55f warblgarbl 2015-07-04 16:49:07 -05:00