cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,771 Commits 9 Branches 26 Tags
175fdf57e6d788dce784f90b8eea84b2e7e91f49
Commit Graph
23771 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Chinsky 175fdf57e6 Merge pull request #8703 from PsiOmegaDelta/Map 
Area/Camera network refactor - Part 1
 2015-04-07 21:41:06 +03:00
PsiOmegaDelta d6aaff7837 Merge pull request #8769 from hockeygoalie5/flourbox 
Changes flour sacks to a condiment
 2015-04-07 06:32:59 +02: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
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
PsiOmegaDelta fd1b6343f0 Merge pull request #8655 from volas/sanitize_procs2 
sanitize(), part 2
 2015-04-06 15:16:17 +02:00
PsiOmega 372a08b32b Merge remote-tracking branch 'upstream/dev' into NewThermals 2015-04-05 23:03:54 +02:00
PsiOmegaDelta 50e8042426 Merge pull request #8760 from Loganbacca/devfix 
Reflex runtime fix
 2015-04-05 19:27:33 +02:00
Zuhayr 5375ade247 Merge pull request #8757 from GinjaNinja32/skipjack 
Skipjack mapping fixes
 2015-04-06 02:50:37 +09:30
Loganbacca 2063ebb8d8 Reflex runtime fix 
- Fixed runtime when reflex shooting targets
- Fixed runtime when stopping aiming at a target which has lost its connected client
 2015-04-05 23:42:01 +12:00
PsiOmega 75757a48f6 Merge remote-tracking branch 'upstream/dev' into Map 2015-04-05 09:55:41 +02:00
PsiOmega d3a1ddfa09 Thermal/NVG changes. 
Thermals/NVGs can now be toggled on/off from the GUI action bar, same as mesons.
Adds charge sound for special goggles.
 2015-04-05 09:54:55 +02:00
PsiOmegaDelta c7a4a77f50 Merge pull request #8758 from GinjaNinja32/patch-1 
Nicer formatting of weapon firing text.
 2015-04-05 09:38:14 +02:00
GinjaNinja32 fb235bf82c Nicer formatting of weapon firing text. 2015-04-05 08:29:59 +01:00
Chinsky c86706f0d3 Merge pull request #8699 from mwerezak/docking-update 
Adds docking support for multishuttles
 2015-04-05 09:49:59 +03:00
Chinsky c965595c85 Merge pull request #8751 from Raptor1628/dev 
Hardsuit Stuff
 2015-04-05 05:31:00 +03:00
Raptor1628 b066d078fd Whoops 2015-04-04 17:59:43 -04:00
Raptor1628 cf74e22870 Hardsuit Stuff 
Icons for all modules and control modules, two new suits, some modified
stats. Station suits are now split, with their spawned "equipped"
version having modules and access requirements, and their parent type
having neither.
 2015-04-04 17:59:10 -04:00
PsiOmegaDelta 298240cf09 Merge pull request #8739 from hockeygoalie5/autofire-radio 
Adds a radio use toggle to reflex fire
 2015-04-04 08:52:05 +02:00
Mustafa Kalash 6e710ad426 Fixes switch operators. 2015-04-03 22:10:23 -04:00
Mustafa Kalash 3c767c50fa Refactors 2015-04-03 21:33:33 -04:00
Mustafa Kalash 94a56e3c2b Adds a toggle for allowing a target to use a radio (handheld or headset.) 2015-04-03 17:42:16 -04:00
mwerezak 2217407dca Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into docking-update 2015-04-03 15:14:44 -04:00
mwerezak f2e816e76e Merge remote-tracking branch 'upstream/dev' into docking-update 2015-04-03 15:04:32 -04:00
PsiOmegaDelta 4904f7737b Merge pull request #8732 from PsiOmegaDelta/dev 
Dev
 2015-04-03 09:39:24 +02:00
PsiOmega 8e55ad8114 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/mob.dm
 2015-04-03 09:33:05 +02:00
PsiOmegaDelta 224cccac68 Merge pull request #8731 from PsiOmegaDelta/dev-freeze 
Dev freeze
 2015-04-03 09:31:36 +02:00
PsiOmega fd8e6f9f32 Corrects the spelling of MINIMUM_MOLES_TO_PUMP. 2015-04-03 09:23:34 +02:00
PsiOmega 4326b8c5d8 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-04-03 09:22:23 +02:00
PsiOmegaDelta b3aeda9d2f Merge pull request #8728 from mwerezak/targeting 
Makes reflex shooting more obvious
 2015-04-03 09:06:46 +02:00
Zuhayr ec80cd8340 Merge pull request #8724 from mwerezak/inventory 
Fixes #8716
 2015-04-03 13:17:10 +10:30
mwerezak a560acd3da Makes reflex shooting more obvious 
Reflex shooting now has a different colour than regular shooting, to prevent mixups
 2015-04-02 21:54:35 -04:00
mwerezak a7e07fc312 Fixes #8716 2015-04-02 17:41:36 -04:00
volas 2622d2dbfc sanitize() refactor: fourth pass 2015-04-03 00:40:57 +03:00
Chinsky 96dd9df079 Merge pull request #8704 from Zuhayr/dev 
Fixes
 2015-04-02 23:49:54 +03:00
Chinsky c584155edd Merge pull request #8688 from PsiOmegaDelta/Events 
Adds more events, misc event changes.
 2015-04-02 23:43:45 +03:00
Chinsky 76ef8c710c Merge pull request #8689 from PsiOmegaDelta/SecLevels 
Allows admins to more easily set security levels.
 2015-04-02 23:43:26 +03:00
Chinsky 8af8383732 Merge pull request #8691 from PsiOmegaDelta/EventFixes 
Fixes event weights not being affected by having been fired before.
 2015-04-02 23:43:24 +03:00
Chinsky f15ce58ec4 Merge pull request #8718 from PsiOmegaDelta/DestroyAllSimpleLife 
Fixes #8582.
 2015-04-02 23:43:17 +03:00
Chinsky 93e6d9dacb Merge pull request #8705 from Zuhayr/dev-freeze 
Fixes, adds weedkiller smoke checks to plants.
 2015-04-02 23:43:06 +03:00
PsiOmega ca70ac1efe Fixes #8582. 
simple_animal/Life() did not terminate properly on death.
Caused issues with bears that would update their icons if Life() returned true (despite having called death).
 2015-04-02 09:47:20 +02:00
Zuhayr 492e89a1f1 Merge pull request #8712 from mwerezak/canister 
Canisters
 2015-04-02 17:57:45 +10:30
PsiOmegaDelta d464599004 Merge pull request #8706 from hockeygoalie5/recipe-fix 
Fixes #8521
 2015-04-02 08:50:36 +02:00
GinjaNinja32 89d8816411 Skipjack mapping fixes 
Changes skipjack walls to simulated shuttle walls with altered icon/icon_state
Changes unsimulated floor in right storage/entrance area to simulated shuttle plating
Changes nitrogen airlock pressure tanks to air ones
 2015-04-02 07:04:18 +01:00
PsiOmegaDelta 2c8a09d7d5 Merge pull request #8713 from GinjaNinja32/latejoin-del 
Fixes runtime when attempting to latejoin into a deleted core
 2015-04-02 07:34:55 +02:00
mwerezak fbd1ddade4 Adds refresh button, fixes arrivals docking frequency. 2015-04-02 00:26:45 -04:00
GinjaNinja32 e82894aadc Fixes runtime when attempting to latejoin into a deleted core 2015-04-02 05:16:20 +01:00
mwerezak a116723fcd Updates canister process() to use atmos helper procs 2015-04-02 00:04:44 -04:00
Zuhayr 1673e8d514 Added organs to the processing list when removed, oops. 2015-04-01 20:54:34 -07:00
Zuhayr 8def76f849 Removing some debugs. 2015-04-01 18:06:46 -07:00