cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 12:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,712 Commits 8 Branches 26 Tags
90f08d3fa7d53270e2a684294dbaf76df2bdb8bf
Commit Graph

2420 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
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
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
GinjaNinja32
bc6daf5b5f Fixes floor painter white-bot and white-delivery states 
Fixes #8937
 2015-04-22 05:21:03 +01: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
1ce81b91b1 Adds bread tube trash item 2015-03-24 04:03:06 -04:00
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
0beb6259f6 Partial fix for #8068. 2015-02-28 17:29:26 +10:30
Chinsky
7f01af6b7d Merge pull request #8297 from PsiOmegaDelta/CameraCoverage 
Camera coverage fixes.
 2015-02-27 13:11:21 +03:00
PsiOmega
7e498e1cf7 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/hydroponics/seed_datums.dm
	code/modules/hydroponics/trays/tray_apiary.dm
	code/modules/power/apc.dm
	code/setup.dm
 2015-02-27 09:06:48 +01:00
PsiOmega
98f6a4cae5 Camera coverage fixes. 
Fixes issues with AI cameras coverage not updating properly in several instances during EMPs, destruction, etc.,
 2015-02-26 11:39:41 +01:00
PsiOmega
4dca85b17c Fixes camera network changes not always being reflected in camera consoles. 
Cameras with altered networks would not necessarily show up on camera consoles, primarily affecting cameras joining/leaving alarm zones.
 2015-02-25 19:50:07 +01:00
Snapshot
600f55bdca Merge pull request #8252 from Raptor1628/dev-freeze 
Assorted Fixes
 2015-02-24 17:08:33 -08:00
Raptor1628
d4870b80ee Assorted Fixes 
Rebalances the random armory so there are always energy weapons,
projectile weapons, and ion weapons. Ammo no longer random. Fixes some
oversights with the EMT area and improves flow. Sec Guns fit in belts.
Fixes typos and a missing price in the vending machine.
 2015-02-24 14:40:02 -05:00
PsiOmega
afb7f7eff7 Fixes #8223. 
Restores a lost, somewhat important, line.
Fixes a duplicate uplink item reference.
 2015-02-24 12:27:03 +01:00
Zuhayr
ee0d63a43d Merged with dev. 2015-02-24 17:03:39 +10:30
Zuhayr
09f15f98f2 Merge pull request #8215 from GinjaNinja32/language 
Fixes a few issues with noise-language.
 2015-02-24 07:49:37 +10:30
GinjaNinja32
e47c45591c Fixes a few issues with noise-language. 2015-02-23 18:58:41 +00:00
PsiOmega
b38d8495b3 Merge remote-tracking branch 'upstream/dev' into SuppliesOfTheGodfather 
Conflicts:
	code/game/gamemodes/game_mode.dm
	code/modules/clothing/spacesuits/rig/suits/merc.dm
 2015-02-23 17:38:50 +01:00
PsiOmega
5be726753f Updates paths after the projectile update. Adds rig modules to the uplink. 2015-02-23 17:33:12 +01:00
mwerezak
6c4d16774f Merge remote-tracking branch 'upstream/dev' into mercenary 
Conflicts:
	code/game/objects/items/devices/uplinks.dm
 2015-02-22 20:44:43 -05:00
mwerezak
115bbbe669 Nerfs merc sniper rifle and makes it uplink purchasable 
Also reduces the Z8's damage a bit, just to make it more in line with
the new bullet damage ranges.
 2015-02-22 20:27:06 -05:00
mwerezak
c317fb8c39 Adds ability for uplink purchases to produce more than one item 2015-02-22 20:17:18 -05:00
Chinsky
79917d57b2 Merge pull request #8187 from PsiOmegaDelta/SyndicateDescriptions 
Rudimentary uplink descriptions.
 2015-02-22 11:32:49 +03:00
Zuhayr
451337476d Merge with dev. 2015-02-21 20:11:35 +10:30
Zuhayr
0c206344b6 Master<dev 2015-02-21 19:57:31 +10:30
Zuhayr
2ecd76b07f Master merge. 2015-02-21 19:51:28 +10:30