cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-16 00:27:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,924 Commits 9 Branches 26 Tags
aa5d5d5256fcc8ea322e760d42178af330bde708
Commit Graph
9414 Commits
Author SHA1 Message Date
PsiOmega aa5d5d5256 Fixes NanoUI interaction. 
A number of machinery objects were returning STATUS_INTERACTIVE instead of parent.
Fixes missing subtype definition for /var/global/datum/topic_state/default/default_state.
 2015-04-13 23:19:22 +02:00
GinjaNinja32 d4eb42b38b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/projectiles/targeting.dm
 2015-04-13 12:49:07 +01:00
PsiOmega c616b67621 Map fixes. 
Fixes #8441.
Fixes #8820.
Less stacked pipes.
Medbay now powers all its shutters.
Fixes duplicate req_access definitions.
 2015-04-13 08:44:13 +02:00
PsiOmegaDelta f988545ed5 Merge pull request #8827 from comma/dev-freeze 
Some fixes
 2015-04-13 08:17:53 +02:00
Chinsky 271977dd7e Fixes #8537 
Apparently drying racks don't actually do anything, but at least now they can do nothing on all the grown fruits! Also added some darkening so people feel like they were slightly less cheated.
 2015-04-13 07:19:40 +03:00
Zuhayr 0223223c77 Merge pull request #8753 from Neerti/4-4-2015_borg_module_stuff 
Revenge of the Research Module (and other stuff from that PR)
 2015-04-12 13:16:45 +09:30
Chinsky 0b7ac73f59 Merge pull request #8805 from PsiOmegaDelta/Engineering 
Area/Camera network refactor - Part 3
 2015-04-11 20:49:15 +03:00
= 78987a436a Merge resolution. 2015-04-11 13:23:17 +09:30
Chinsky 7a40d193fe Merge pull request #8801 from PsiOmegaDelta/NanoRefactorUmptheen 
Refactors NanoUI interaction (again)
 2015-04-11 04:43:50 +03:00
Chinsky c9fc94e1ff Merge pull request #8803 from Zuhayr/dev-freeze 
Readds vox pariah.
 2015-04-11 04:21:13 +03:00
Chinsky be3f372680 Merge pull request #8788 from PsiOmegaDelta/PortedSpells 
Ports /vg/'s spell system for use by the cult port.
 2015-04-11 02:05:58 +03:00
PsiOmega 2836dcf648 Merge remote-tracking branch 'upstream/dev' into Engineering 2015-04-10 16:06:42 +02:00
PsiOmega 49d3f0fcf7 Merge remote-tracking branch 'upstream/dev' into NanoRefactorUmptheen 2015-04-10 15:49:36 +02:00
PsiOmega 1ba8dcbca9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/vending.dm
 2015-04-10 15:25:34 +02:00
PsiOmega 24fe95933e Area/Camera network refactor - Part 3 
Renames areas for more logical order in alarm consoles and other locations.
Begins dividing the cameras into separate networks instead of being dumped into SS13. Changes c-tags to ensure related cameras are sorted together.
Engineering/Outpost/Solars updated this run.

Also includes:
Fixes #8727.
 2015-04-10 15:17:05 +02:00
Zuhayr d70ea77c2d Moved stack into heist antag creation for pariah reinclusion. 2015-04-10 02:35:04 -07:00
Chinsky 05da117d10 Merge pull request #8778 from PsiOmegaDelta/CivilianWest 
Area/Camera network refactor - Part 2
 2015-04-10 12:28:33 +03:00
Chinsky a8bf62634e Merge pull request #8774 from mwerezak/vending 
Fixes #8771
 2015-04-10 12:28:12 +03:00
Chinsky 5fc3a2a511 Merge pull request #8792 from GinjaNinja32/runtime 
Runtime fixes
 2015-04-10 12:24:35 +03:00
Chinsky 7cea6b80c0 Merge pull request #8794 from GinjaNinja32/atmos 
Fixes atmos supply control consoles
 2015-04-10 12:24:17 +03:00
PsiOmega e37c5c22d4 Refactors NanoUI interaction (again) 
Takes NanoUI interaction code and splits it into more manageable modules.

The default handler that checks distances, camera coverage, etc., etc.
Admin NanoUI windows now only check for admin rights, ignoring sight, distance, and anything else.
ERT/mercenary appearance changer now remains open for as long as the mob remains on the admin Z-level.
PDAs and uplinks now require that you keep the item somewhere in your main inventory (or contents to be precise). Hands or ears are fine, inside bags are not.
Rig suits also check that they are in the operator's inventory or that the synthetic operator is somewhere within the suit's contents (recursively).
 2015-04-10 11:19:38 +02:00
Kelenius 20d62c87ff Borg module fixes 
Fixes #8775
Fixes #8797
 2015-04-10 09:50:47 +03:00
Neerti 45947bb9f5 Addresses Zuh's issues so he'll stop wracking me. 2015-04-09 21:22:04 -04:00
PsiOmega 990530d118 Ports /vg/'s spell system for the sake of cult porting. 
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
 2015-04-09 20:08:06 +02:00
GinjaNinja32 de5104685f Fixes atmos supply control consoles 
Fixes #8400
 2015-04-09 17:05:27 +01:00
GinjaNinja32 958a1c64b3 Fixes PDA detonation runtime 
Fixes #8609
 2015-04-09 16:05:53 +01:00
Chinsky 3286de0a4f Merge pull request #8766 from PsiOmegaDelta/BetterMath 
Emergency shuttle delay feedback correction.
 2015-04-09 08:15:22 +03:00
Chinsky 7b15bd59e5 Merge pull request #8768 from Yoshax/emergencymessage 
Emergency message changes
 2015-04-09 08:15:19 +03:00
PsiOmega b52e3168c2 Area/Camera network refactor - Part 2 
Renames areas for more logical order in alarm consoles and other locations.
Begins dividing the cameras into separate networks instead of being dumped into SS13. Changes c-tags to ensure related cameras are sorted together.
Civilian West (vacant office, cargo, primary tool storage, etc., main hallways excluded) updated this run.

Also includes:
All staff offices, including QM's, now have a privacy mode and door buttons.
 2015-04-08 13:20:22 +02:00
PsiOmega 71a8ddf50e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm
 2015-04-08 10:55:26 +02:00
PsiOmega 66c56926d0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/gamemodes/cult/runes.dm
 2015-04-08 10:40:38 +02:00
Zuhayr cee229733e Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into dev 2015-04-07 18:38:59 -07:00
Chinsky 143f036ccd Merge pull request #8745 from Kelenius/ofLingsAndMeta 
Removes the bullshit ling meta message
 2015-04-08 03:24:15 +03:00
Chinsky 23c20556b4 Merge pull request #8767 from RavingManiac/dev-freeze 
Vending Machine Fixes
 2015-04-08 03:23:40 +03:00
mwerezak 193430bff9 Fixes #8771 2015-04-07 15:55:18 -04:00
Chinsky 175fdf57e6 Merge pull request #8703 from PsiOmegaDelta/Map 
Area/Camera network refactor - Part 1
 2015-04-07 21:41:06 +03:00
Yoshax bb9a418ed0 Fixes blue, removes commented out code, gives file a meaningful name. 2015-04-07 13:54:22 +01:00
RavingManiac 6482dfb374 EFTPOS scanners now work with IDs in PDAs and wallets 
Vending machine code revised slightly

"\the" added to visible messages where applicable
 2015-04-07 22:09:11 +10:00
RavingManiac adf39aaace Vending machines should now work with any ID-containing object 2015-04-07 13:10:03 +10:00
Mustafa Kalash 177d968933 Changes flour sacks to a condiment, so that players will be able to pour flour straight into beakers, instead of having to use the grinder first. 2015-04-06 18:40:11 -04:00
Yoshax d78ae0d509 Merge branch 'aiemergencymessage' into emergencymessage 2015-04-06 20:19:27 +01:00
Yoshax 5a34b1481b Big emergency message changes 2015-04-06 20:17:18 +01:00
Chinsky 4a897e47b9 Merge pull request #8641 from PsiOmegaDelta/CultVisualNetwork 
Cult Visual network
 2015-04-06 20:19:49 +03:00
Chinsky cbfa0ef0e8 Merge pull request #8759 from PsiOmegaDelta/NewThermals 
Thermal/NVG changes.
 2015-04-06 20:14:39 +03:00
RavingManiac 0be6fd113a PLayer can now pay vending machines without removing ID from PDA or wallet. Clicking on the vending machine with ID/PDA/wallet/cash also brings up the menu instead of attacking the vending machine. 2015-04-07 03:00:51 +10:00
PsiOmega aeb0af8a7f Emergency shuttle delay feedback correction. 
The emergency shuttle now states that the max refuel is 10 minutes rather than 100 minutes.
 2015-04-06 15:26:46 +02:00
PsiOmegaDelta fd1b6343f0 Merge pull request #8655 from volas/sanitize_procs2 
sanitize(), part 2
 2015-04-06 15:16:17 +02:00
PsiOmega d8a6576f36 Examination fixes. 
Fixes #8491.
Fixes #8579.
 2015-04-06 10:46:19 +02:00
PsiOmega 036a948372 Rune logging. 
Adds various rune logging.
 2015-04-06 09:44:56 +02:00
Yoshax b69ab10da0 Merge branch 'dev' into aiemergencymessage 2015-04-05 17:39:30 +01:00