Commit Graph

4317 Commits

Author SHA1 Message Date
PsiOmega
5ee1e3df56 Fixes #9443.
Restores an old sunflower sprite for use by toys.
2015-05-23 19:38:31 +02:00
Zuhayr
3377f8bbf1 Merge pull request #9407 from GinjaNinja32/floorpainter
Fixes floor painter 'side/3 corners'->'black' and another state
2015-05-21 18:43:00 +09:30
GinjaNinja32
0aff37a72c Fixes floor painter 'side/3 corners'->'black' and another state 2015-05-21 06:03:15 +01:00
mwerezak
defc4c1f94 Adds check_charge(), checked_use() 2015-05-18 20:09:09 -04:00
mwerezak
53855d2398 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into charge 2015-05-18 18:47:45 -04:00
Zuhayr
3ed1917c3a Vine tweaks. Fireaxes one-shot vines, vines are mouse opaque. 2015-05-18 13:23:21 +09:30
mwerezak
aeb1f5ae68 Updates instances of if(cell.use(...)) 2015-05-14 01:52:04 -04:00
ccomp5950
569e785014 Holodeck items no longer spam admin attack logs.
/obj/items now has no_attack_log variable if set to 1, it won't log.

All holodeck items and lasertag weapons have no_attack_log set.

<3 Mangled
2015-05-11 22:11:46 -04:00
PsiOmega
d1eae14343 Fixes #9183
Very critical. No lewdness allowed.
2015-05-11 09:08:27 +02:00
PsiOmega
9d883ea914 Corrects implanter attack log.
The contents of the implant was reported in the attacker/victim log but not the admin log.
2015-05-10 15:11:37 +02:00
Chinsky
d1b4289b74 Merge pull request #9118 from PsiOmegaDelta/HaltSecurity
Fixes #9065.
2015-05-06 17:25:11 +03:00
PsiOmega
4af458ef6c Fixes #9065.
Central Command ids now at least makes security equipment respect you.
2015-05-06 15:23:44 +02:00
PsiOmega
767c6a151b Fixes #9107.
The empty donut box no longer uses a non-existing item state.
2015-05-06 15:06:19 +02:00
Atlantiscze
91e3ced65e Powersink Fix
- Fixes powersinks lasting for infinite duration before exploding.
- Minor adjustment to powersink drain rates. Powersink now drains up to 1.5MW instead of  1MW. It also attempts to drain up to 5kW instead of 2kW from each APC, unless powernet supplies enough power. They can still be overpowered by pumping more than 1.5MW into the grid, which is possible if you either install more coils into main SMES, or use the solars. Even 1MW of default SMES is enough to slow the drain effect considerably, espicially if you can isolate it with breakers.
- Fixes "APC Flickering" issues caused by powersinks. Powersinks are now processed immediately after powernets, which ensures they are first to take power from that powernet. This is unfortunately necessary as APCs would take power first, which is not desired.
- Minor refactor while i was at it - absolute paths, span classes, visible_message() instead of for cycle. No gameplay effect.
2015-05-05 18:49:11 +02:00
Ccomp5950
4a7d970bce Merge pull request #9090 from Kelenius/ofLogsAndTypos
Fixes a few log-destroying lines
2015-05-04 15:30:13 -04:00
Kelenius
33dde892e2 Fixes a few log-destroying lines 2015-05-04 21:33:30 +03:00
PsiOmegaDelta
d86dd60c63 Merge pull request #9064 from Loganbacca/smokeFix
Chem smoke fadeOut sanity checks
2015-05-04 14:52:33 +02:00
Loganbacca
6238dabf88 Chem smoke fadeOut sanity checks
Ported updates from /tg/ to fadeOut code. Updates written by vista-
2015-05-02 13:33:25 +12:00
mwerezak
b10c64d48b Adds a closet breakout animation, fixes spamming the breakout proc 2015-05-01 16:19:52 -04:00
mwerezak
98a4f54b88 Adds span classes, moves secure closet procs 2015-05-01 01:23:53 -04:00
mwerezak
cd707d8279 Resist verb cleanup
Fixes #8922 and cleans up resisting.
Moves various code pieces to new procs, subtypes, or other objects where
appropriate.
2015-05-01 01:23:26 -04:00
PsiOmegaDelta
1e457f6e34 Merge pull request #9009 from Yoshax/icanintosurgery
Fixes antag surgery kit
2015-04-28 07:35:58 +02:00
Yoshax
aa115f5bb2 Fixes antag surgery kit 2015-04-27 16:41:47 +01:00
RavingManiac
89a72fb326 Candle burn time increased to ~30 minutes
Some fluff added to candle description explaining how they burn in space
2015-04-27 12:10:54 +10:00
Chinsky
392cc1b0bb Merge pull request #8938 from GinjaNinja32/floorpainter
Fixes floor painter white-bot and white-delivery states
2015-04-23 09:20:13 +03:00
GinjaNinja32
bc6daf5b5f Fixes floor painter white-bot and white-delivery states
Fixes #8937
2015-04-22 05:21:03 +01:00
PsiOmega
f6d0ab1578 Shower curtains no longer lose their default color upon being washed.
NT has now invested in slightly less budget curtains.
2015-04-20 14:42:43 +02:00
Chinsky
511d3764e7 Merge pull request #8846 from PsiOmegaDelta/CantClickMeDontClickMe
Makes objects without moues opacity not appear via alt-click.
2015-04-18 16:57:01 +03:00
GinjaNinja32
159dccbfab Fixes floor painter solid-dark icon
Fixes #8873
2015-04-17 03:18:53 +01:00
PsiOmega
3eab61e154 Soap can now clean turfs as well. 2015-04-16 08:20:00 +02:00
Chinsky
5fc3a2a511 Merge pull request #8792 from GinjaNinja32/runtime
Runtime fixes
2015-04-10 12:24:35 +03:00
Kelenius
20d62c87ff Borg module fixes
Fixes #8775
Fixes #8797
2015-04-10 09:50:47 +03:00
GinjaNinja32
958a1c64b3 Fixes PDA detonation runtime
Fixes #8609
2015-04-09 16:05:53 +01:00
RavingManiac
e2b9657ca4 Minor fixes to supermatter manual text 2015-04-05 22:40:19 +10:00
mwerezak
c59fac2e16 Adds unloaded item state for the STS-35. 2015-03-29 02:40:57 -04:00
mwerezak
ba9b8756da Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file 2015-03-29 01:52:26 -04:00
Zuhayr
0bb2cd835c Merge pull request #8600 from mwerezak/bread-tube
Adds bread tube trash item, merc shuttle vendor
2015-03-25 00:54:16 +10:30
mwerezak
1ce81b91b1 Adds bread tube trash item 2015-03-24 04:03:06 -04:00
Zuhayr
45f28d5372 Fixes #8485 2015-03-24 13:20:24 +10:30
Zuhayr
bf8ad6d585 Rebalanced xenoflora sprites, fixed numerous issues. 2015-03-22 16:13:15 +10:30
PsiOmega
6e2488ccb0 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/stool_bed_chair_nest/chairs.dm
2015-03-20 08:26:34 +01:00
PsiOmega
3d9d05afce Fixes #8107.
The announcer again has its given name, rather than a randomly selected one.
The announcer now states its business, rather than talks about it.
The announcer now uses the proper frequency.
2015-03-19 21:33:58 +01:00
Mandurrrh
618249131e Gives more/better comfychair color options. Removes unused icons from objects.dmi. 2015-03-18 00:26:42 -04:00
Zuhayr
e600cdbd3b Fixes #8430 2015-03-17 19:18:30 +10:30
PsiOmega
533ccef0ab Robot code clean up and fixes.
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
2015-03-10 13:37:20 +01:00
Zuhayr
00976aea43 Merge pull request #8417 from PsiOmegaDelta/SolidMatter
Attemps to fix #8390 + solid bonus
2015-03-10 09:29:04 +10:30
Zuhayr
fc985c2a27 Merge pull request #8416 from PsiOmegaDelta/Ninjas
Fixes ninja spawn logic.
2015-03-10 09:27:11 +10:30
PsiOmega
baed39c263 Attempts to fix persistent station alarms. Makes wardrobes solid. 2015-03-09 20:55:05 +01:00
mwerezak
b9d2517d83 Tweaks random gun spawners and supply packs
laser carbines and laser pistols spawn in the armoury with equal
probability.
Stunshells are now rare like they should be.
Shotgun crates now have two combat shotguns, as they are less likely to
spawn in the armoury anyways.
Weapons crate comes with laser pistols, energy weapons crate comes with
laser carbines. Seemed more consistent that way.
2015-03-09 15:47:25 -04:00
PsiOmega
57c0591283 Fixes ninja spawn logic.
Fixes the logic I re-made after a PR comment without double-checking it.
Changes ninjastart to use the actual landmarks instead of locs for consistency.
2015-03-09 19:22:07 +01:00