ESwordTheCat
a7fba1d708
Let depend on use_power var if we need to know the area.
2014-04-20 10:07:13 +08:00
ESwordTheCat
8ad88d2e6c
Merge remote-tracking branch 'upstream/Bleeding-Edge' into 86823712
2014-04-20 09:45:07 +08:00
Rob Nelson
3ef5defb29
Missing files
2014-04-19 18:43:54 -07:00
ESwordTheCat
7b92537e5a
Merge remote-tracking branch 'upstream/Bleeding-Edge' into 86823712
2014-04-20 09:32:31 +08:00
Rob Nelson
2435d6c9d7
Miners now get dollas, QM gets paid when they buy shit, QM can set payment target of equipment locker.
2014-04-19 18:28:34 -07:00
ESwordTheCat
79866d0184
Revert from area to text.
2014-04-20 09:27:18 +08:00
ESwordTheCat
8986bfafb3
Use the experimental getArea.
2014-04-20 09:00:50 +08:00
ESwordTheCat
30ffa20445
Declare myArea as an area.
2014-04-20 09:00:22 +08:00
ESwordTheCat
f2d917ba35
experimental getArea() proc.
2014-04-20 08:59:36 +08:00
ESwordTheCat
02dddfeba0
Because it use less instructions.
2014-04-20 08:48:25 +08:00
ESwordTheCat
f7905ebdd8
Don't use get_area proc, introduce myArea variable.
2014-04-20 08:46:59 +08:00
Rob Nelson
9b062eff9e
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge
2014-04-19 15:58:25 -07:00
Rob Nelson
de765116de
Part 1 of economy rework: Spacecash refactor - See commit for full changelog.
...
* Implements stacking and stack overlays
* Simplified tiers of cash (1,10,100,500,1000, may remove 500)
* Simplified API (dispense_cash, count_cash)
2014-04-19 15:58:14 -07:00
d3athrow
c2ae51be17
Merge pull request #633 from ESwordTheCat/31758173
...
Minor change to hear proc.
2014-04-19 01:45:06 -05:00
Rob Nelson
a9ea1e89b0
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge
2014-04-18 20:46:07 -07:00
Rob Nelson
475eb925be
Fix jukebox formatting
2014-04-18 20:40:44 -07:00
ESwordTheCat
aa35c03e5d
Reduce use of named arguments.
2014-04-19 07:59:28 +08:00
ESwordTheCat
3ee2996f14
Oops my bad revert this.
2014-04-19 01:47:04 +08:00
ESwordTheCat
29b530dd30
. var(proc) use less instructions.
2014-04-19 01:45:02 +08:00
ESwordTheCat
b184a388cc
Make luminosity dynamic.
2014-04-19 01:36:27 +08:00
d3athrow
07a29e4852
Compile fix
2014-04-18 11:39:10 -05:00
d3athrow
02cb957714
Merge pull request #622 from ESwordTheCat/69247123
...
narrow it a little
2014-04-18 11:32:57 -05:00
Rob Nelson
ae1d0cbb03
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge
2014-04-18 00:23:57 -07:00
Rob Nelson
9be42672ac
Fix some of the retardation of reagents: Optimize, fix logic flow, stupid recursive total updating, etc
2014-04-18 00:23:40 -07:00
d3athrow
db634e5b3b
Merge pull request #608 from VelardAmakar/bookcases
...
Bookcase Construction
2014-04-17 18:46:05 -05:00
Rob Nelson
e6bcafe924
Fix jukebox after hammering it :V
2014-04-17 02:17:44 -07:00
Rob Nelson
28df1f1417
Fix a bunch of jukebox issues, clean up UI a bit, add feedback, allow slapping it to reset if broken.
2014-04-17 02:12:54 -07:00
Rob Nelson
20055440f1
Added R&D console to research added new areas, cleaned up research room, etc.
2014-04-16 23:04:54 -07:00
Rob Nelson
083f9f5471
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge
2014-04-16 19:27:45 -07:00
Rob Nelson
09683bc2ba
Optimize the fuck out of Bustanuts.
2014-04-16 19:26:43 -07:00
Rob Nelson
4dc33d8196
Add more flexible silicon job detection.
2014-04-16 19:06:48 -07:00
Rob Nelson
047352e90d
Merge pull request #632 from Duny-/Bleeding-Edge
...
Remove bwoink from soundsynth and force borgs to choose a sprite
2014-04-15 22:57:40 -07:00
Rob Nelson
445e7323f9
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge
2014-04-15 22:51:10 -07:00
Rob Nelson
3caf92f4eb
Add coldroom to derelict server, atmos shit, fluff.
2014-04-15 22:50:54 -07:00
d3athrow
2a862aa68e
Fix lighting not updating when A door closes.
2014-04-16 00:33:56 -05:00
d3athrow
9efa35e522
Fix not being able to resist out of headlocks
2014-04-16 00:33:25 -05:00
Rob Nelson
a66a0451ab
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge
2014-04-15 21:29:34 -07:00
Rob Nelson
b3e3329707
Get rid of CMTL calcs, and optimize server temperature shit.
2014-04-15 21:29:07 -07:00
Duny
20f7149076
Fix borgs not choosing an appareance
...
Locks down cyborgs after they choose a module until they choose an
appareance, to prevent standard borgs with security modules and such
running around.
2014-04-16 04:32:01 +02:00
Rob Nelson
05bbdf1e20
Merge pull request #631 from Duny-/Bleeding-Edge
...
Fix doors duplicating upon deconstruction
2014-04-15 16:37:07 -07:00
Duny
387f740a38
Changes soundsynth's bwoink to bubbles
...
(http://bugs.nexisonline.net/issues/204 )
2014-04-16 00:39:44 +02:00
Duny
4437194d3a
Fix doors duplicating upon deconstruction
...
Deconstructing a door spawns an assembly and airlock electronics then
deletes the door. For some reason the last part wasn't working properly.
2014-04-15 22:21:47 +02:00
Rob Nelson
4d66946e69
Feeble attempt at optimizing AddToKnownDesigns.
2014-04-14 20:36:36 -07:00
Rob Nelson
8ab1b8270e
Disable tech prerequisite checks.
2014-04-14 19:37:10 -07:00
Rob Nelson
9b9f628a21
Disable glowshroom spreading.
2014-04-14 17:57:57 -07:00
Rob Nelson
73c378278d
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge
2014-04-13 21:31:58 -07:00
Rob Nelson
a0a66c9607
Fix AAC ghost dickery.
2014-04-13 21:31:20 -07:00
d3athrow
6eda5a74eb
Merge pull request #629 from Walter0o/patch-3
...
Fixes a critical exploit with the autolathe (push to dev)
2014-04-13 19:15:05 -05:00
Rob Nelson
0580ca1198
Merge pull request #628 from Duny-/Bleeding-Edge
...
Fixed Incendiary Mithocondria, nerfed Cryokinesis a bit
2014-04-13 14:53:10 -07:00
Duny-
308536fa06
Update goon_disabilities.dm
...
Add full path for the sound effect
2014-04-13 23:25:33 +02:00
