cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 04:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,241 Commits 8 Branches 26 Tags
c7573a0d11a37dc2dfd14699a30a8bb687fe2eb8
Commit Graph

4282 Commits

Author SHA1 Message Date
MrSnapwalk
cb0ec5abe4 Adds 7 new posters. 2015-03-06 21:14:32 -06:00
mwerezak
9f55526bce Toolboxes can now hold a limited number of w_class 3 items 
They can hold up to 3 w_class 3 items, or the usual 7 w_class 2 items.
 2015-03-05 11:10:26 -05:00
mwerezak
9aed472531 Minor storage cleanup 
Demotes folding to storage/box, makes doughnut boxes a subtype of box.
Removes a couple of istype() hacks from storage.
 2015-03-05 11:08:22 -05:00
mwerezak
3bf5a5ca99 Updates storage costs 
Storage cost of an item is now twice that of the next smallest item, instead of being equal to the w_class.
Items with w_class 1 or 2 are unaffected. This produces much better behaviour for containers that are limited
by storage space instead of slots, such as how toolboxes are planned to work in a future update.
 2015-03-05 10:40:25 -05:00
PsiOmega
3e9f33136a Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/effects/decals/Cleanable/fuel.dm
	maps/exodus-5.dmm
 2015-03-05 09:20:20 +01:00
Raptor1628
cf0e526d91 Fixes and adjustments 
Moves a few things around in the armory again, tasers back in lockers,
guns in officer access area of the armory. Re-adds the tacknife after it
was lost in the hydro merge, gives EMTs access to medical lockers.
 2015-03-04 11:18:40 -05:00
PsiOmega
8f929331d8 Fixes #8343 
Fuel no longer attempts to spread itself after having been deleted.
 2015-03-03 15:33:15 +01:00
Chinsky
81a9f87ad7 Merge pull request #8336 from mwerezak/liquidfire 
Implements liquid fuel fires
 2015-03-03 10:31:49 +03:00
Chinsky
ca0f08c30a Merge pull request #8331 from PsiOmegaDelta/PDATrack 
The AI now have the ability to track senders of PDA messages.
 2015-03-03 10:21:06 +03:00
mwerezak
49b3db964f Implements fuel fires 
Implements liquid fuel fires using the liquid fuel cleanable decal objects.
Rewrites zburn to be more sane, replaces convoluted calculations with straightforward reaction limit.
Fixes issue with liquid fuel spreading caused by thee object being deleted.
Prevents zones from being repeatedly added to the active fire zones list, and processed repeatedly.
 2015-03-02 12:40:01 -05:00
PsiOmega
02a1e1d129 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/light.dm
 2015-03-01 21:15:47 +01:00
PsiOmega
b82df37159 The AI now have the ability to track senders of PDA messages. 
Can only track the original owner of a PDA.
Cannot track the senders/receivers of intercepted messages.
All other tracking conditions apply (camera coverage, no agent ID, etc.).
 2015-03-01 20:55:27 +01:00
Zuhayr
64b33c43db Refactors some job variables from the Economy file (what the fuck) and swaps created types for lists in bot access assignment. 2015-02-28 20:20:19 +10:30
Zuhayr
0beb6259f6 Partial fix for #8068. 2015-02-28 17:29:26 +10:30
Zuhayr
14321003f1 Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze 2015-02-28 17:04:22 +10:30
Zuhayr
4b15f1a249 Fixes #7877 2015-02-28 16:47:41 +10:30
Zuhayr
f7983e7732 Merge pull request #8293 from comma/interfacefix 
Couple fixes
 2015-02-28 16:22:36 +10:30
Chinsky
7f01af6b7d Merge pull request #8297 from PsiOmegaDelta/CameraCoverage 
Camera coverage fixes.
 2015-02-27 13:11:21 +03:00
PsiOmega
2c032cacaf Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-27 09:52:51 +01: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
Chinsky
9e07708cb3 Fixes #8241 rollerbeds not collapsing due to a runtime 2015-02-26 14:41:31 +03: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
Chinsky
100d8e9fb8 Fixed buckling into chair not changing mob's facing if he had permafacing set. 2015-02-26 12:09:23 +03:00
PsiOmega
e7653e1ed5 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-26 08:22:25 +01:00
Zuhayr
a9d23df3ff Merge pull request #8279 from PsiOmegaDelta/CameraNet 
Fixes camera network changes not always being reflected in camera consoles.
 2015-02-26 16:28:49 +10:30
Zuhayr
bceb01c233 Merge pull request #8290 from mwerezak/gun-rewrite 
Fixes captain's laser gun
 2015-02-26 16:28:43 +10:30
Zuhayr
0e80242e92 Merge pull request #8212 from PsiOmegaDelta/CleanTopic 
Minor NanoUI/Topic cleanup
 2015-02-26 16:27:08 +10:30
mwerezak
ec59f8ab07 Fixes captain's laser gun 
Also updates retro laser gun path, as it isn't really conceptually
related to the carbine anymore, and should avoid inheriting things like
fire rate.
 2015-02-25 23:35:20 -05:00
MrSnapwalk
f4f54dfed1 Fixes action figures not randomizing properly. 2015-02-25 21:52:36 -06: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
PsiOmegaDelta
51b722485a Merge pull request #8259 from mwerezak/gun-rewrite 
Gun fixes
 2015-02-25 07:21:29 +01:00
mwerezak
9782140d32 Resolves #8236 
Lasers deal more damage to grilles, and clicking directly on the grille
makes it more likely for the grille to absorb the projectile.
 2015-02-25 00:14:42 -05:00
mwerezak
3e71802a52 Replaces colt signal pistol with a Mk58 version. 
Makes more sense for the HoP, and ensures the colt remains more of a
detective signature item.
 2015-02-24 21:23:19 -05: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
Zuhayr
24dacf0169 Merge pull request #8227 from PsiOmegaDelta/Syndicate 
Fixes #8223.
 2015-02-25 05:46:20 +10:30
PsiOmega
afb7f7eff7 Fixes #8223. 
Restores a lost, somewhat important, line.
Fixes a duplicate uplink item reference.
 2015-02-24 12:27:03 +01:00
Neerti
917bad5d5b Removes all the fun from buckling. 2015-02-24 06:15:44 -05: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
Chinsky
b5dda2b793 Merge pull request #8180 from mwerezak/mercenary 
Map updates and fixes, plus hardsuit icons
 2015-02-23 15:27:35 +03:00
PsiOmega
eb5e5aa0ba Minor NanoUI/Topic cleanup 
The default state handler is now assigned as the default argument value, instead of having to utilize null-checks.
 2015-02-23 10:23:40 +01:00
PsiOmegaDelta
bbbde676d5 Merge pull request #8200 from mwerezak/devfixes 
Misc dev updates
 2015-02-23 10:15:42 +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