cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,857 Commits 5 Branches 0 Tags
2c076b4e46d5a39ee9bc047fff5d12912111fc79
Commit Graph

14042 Commits

Author SHA1 Message Date
PsiOmega
2c076b4e46 Merge branch 'dev' into MechInstall 2014-07-27 12:52:42 +02:00
Chinsky
4e96420e49 Merge pull request #5761 from Zuhayr/hydroponics 
BYOND akbar
 2014-07-27 14:38:18 +04:00
PsiOmega
4f8dc3f951 Installs the new mecha-sensor in the departure area airlocks and the shuttle itself. 
Also corrects the online icon state for the sensor and allows the simple docking controller to toggle the on/off state.
 2014-07-27 10:58:55 +02:00
Zuhayr
c6e97ecc9a Merge pull request #5791 from PsiOmegaDelta/Roadblock 
Mech/Train sensor
 2014-07-27 10:12:55 +09:30
PsiOmega
0036bea6b6 A sensor which registers mechs and trains attempting to pass by and, if necessary, blocks their movement. 
If enabled, detects mechs/trains and blocks their movement if they are coming from any of the directions set by dir. Can currently only be enabled/disabled by radio command and airlocks are updated to utilize this.

The current setup allows mechs to move through airlocks during normal cycles, which for example lets Odysseus out to save lives.
Once a shuttle docks however, the sensors are enabled to prevent boarding.

If blocked, players receive a simple message stating that their command has been overridden.
 2014-07-26 20:07:18 +02:00
Zuhayr
e5eb9cc496 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-27 03:24:27 +09:30
Zuhayr
dc10f92ad1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-27 03:23:35 +09:30
Zuhayr
4ef8a08310 Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 2014-07-27 03:20:16 +09:30
Zuhayr
976cb4f844 Fixed seeds not showing up properly in the vendor. 2014-07-27 03:19:43 +09:30
Mloc-Hibernia
a2dc7b827b Merge remote-tracking branch 'upstream/pr/5689' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/crew.dm
 2014-07-26 14:25:24 +00:00
Chinsky
11a1370b10 Merge pull request #5781 from PsiOmegaDelta/Tweaking 
Engine room and Atmospherics  changeup.
 2014-07-26 17:56:00 +04:00
Chinsky
c34cf89a04 Merge pull request #5784 from Jarcolr/patch-3 
Fixes #5691
 2014-07-26 17:18:38 +04:00
Jarcolr
9e233f1597 Fixes #5691 
Chef >> Chefhat
 2014-07-26 13:41:43 +03:00
Jarcolr
17f86962ac Fixes #5773 
Added /obj/item/weapon/FixOVein to surgery cyborg modules.
 2014-07-26 12:50:41 +03:00
PsiOmega
1bee077475 Engine room and Atmospherics changeup. 
The supply pipe in Atmospherics no longer cross the middle of the room, after having seen many a complaint about this. Now passes through the aft windows instead.

Atmosphere technicians can now assist in handling the engine waste without entering the engine room itself.

Engine waste canisters are now pre-labeled according to future contents. Can be re-labeled should someone desire to try the oxygen setup instead.

The engine core now uses a similar setup as the atmospheric tanks, allowing control of the injection/extraction of gases from the monitor room.

Pipes  in the engine room overlapp less, making them easier to follow.

There is now a basic meteor protection layer around the engine room like solar panels have. Should stop a lone meteor or two, for anything more Renwick shields will still be desirable.
There is also a fairly wide gap by the ejection port, to ensure the supermatter doesn't snag into it, where meteor can sneak through.
 2014-07-26 11:44:22 +02:00
Jarcolr
8296f29c76 Fixes #5506 and split of groups 
Engineering split into new group "Atmospherics".
Medical / Science nwo "Medical" and "Science".
 2014-07-26 12:32:19 +03:00
Zuhayr
bc25cca7a9 Merge branch 'hydroponics' of https://github.com/Zuhayr/Baystation12 into hydroponics 2014-07-26 15:45:26 +09:30
Zuhayr
5a108b2d05 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-26 15:40:28 +09:30
Zuhayr
efe1c2feb2 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-26 15:39:25 +09:30
DJSnapshot
d4ce124fe0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hotfix 2014-07-25 19:37:10 -07:00
DJSnapshot
9be6de1e77 fixes admin show-skills verb. 2014-07-25 19:34:13 -07:00
DJSnapshot
de282a4e2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/client/preferences.dm
 2014-07-25 17:19:59 -07:00
DJSnapshot
a4fc2b04a2 fix to allow non-humans to be stunned like they should be. Gosh. (Also, clumsy check and making harmbaton actually work) 2014-07-25 16:56:56 -07:00
Chinsky
f33e11383b Merge pull request #5751 from DJSnapshot/hotfix 
Bug Fixes!
 2014-07-26 03:28:54 +04:00
DJSnapshot
ec238be981 Revert and fix for e-nets. 2014-07-25 16:23:26 -07:00
Chinsky
2e043adb48 Merge pull request #5758 from Kelenius/OfVotesAndPlayers 
Adds amount of required players to gamemode vote.
 2014-07-26 00:23:00 +04:00
Zuhayr
69b397b5c4 Compile fix. 2014-07-26 01:42:05 +09:30
Zuhayr
b32bbf8d2c Merge pull request #5741 from mwerezak/wound-infections 
Attempts to prevent ninja infections, body temperature fix, icon fix
 2014-07-26 01:30:12 +09:30
Zuhayr
6e63659855 Merge pull request #5743 from meyar/dev 
CSI BAYSTATION: The detectivining.
 2014-07-26 01:29:37 +09:30
Zuhayr
005ac89aad Tweaks to previous commit. 2014-07-25 23:41:41 +09:30
Zuhayr
19cfe8940c Added table layout to vote form. 2014-07-25 23:32:05 +09:30
Zuhayr
d8336061b4 Merge branch 'hydroponics-pr' of https://github.com/Zuhayr/Baystation12 into dev 2014-07-25 23:02:21 +09:30
Zuhayr
5da36d265e Merge resolution with PDA nanoui. 2014-07-25 22:57:53 +09:30
Zuhayr
57b790ad92 Merging. 2014-07-25 22:50:35 +09:30
Zuhayr
99909e3aba Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-25 22:47:57 +09:30
Kelenius
a7748c8542 Adds amount of required players to gamemode vote. 2014-07-25 17:05:15 +04:00
Zuhayr
ea8b08c49b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-25 22:34:40 +09:30
Zuhayr
6f44f6c1e7 Removed outdated file. 2014-07-25 22:16:29 +09:30
Zuhayr
4d1812ba2b Hydroponics rewrite, details will be in PR. Big commit. 2014-07-25 22:16:04 +09:30
Zuhayr
7fb8f30cc7 New machines, adjusted Cael's seeds, rewrote space vines. 2014-07-25 22:15:33 +09:30
Chinsky
8884310b8c Merge pull request #5753 from Loganbacca/trainmerge 
Cargo Trains
 2014-07-25 13:05:55 +04:00
DJSnapshot
2c7bb6c48d Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request. 2014-07-24 17:01:52 -07:00
Loganbacca
31fe0d5e34 Cargo train fixes 
- Visual tweak for mobs on trolleys
- Fixed a teleportation bug when boarding trains from other trains
- Fixed a runtime involving on_click code
 2014-07-24 20:14:58 +12:00
Chinsky
4c4aa7b52b Merge pull request #5749 from Ccomp5950/languages_fix 
Added . and # prefix to language keys checks (like radios)
 2014-07-24 10:48:40 +04:00
Loganbacca
1b1e4bc118 Cargo train update 
- Adds sprites (thanks to Bishop)
- Adds order-able train cargo crates
 2014-07-24 18:01:10 +12:00
Zuhayr
f2f9a5afc4 Removes the flying baton of justice. 2014-07-24 15:21:57 +09:30
DJSnapshot
bb336b7691 temporary fix for #4907 2014-07-23 21:48:32 -07:00
DJSnapshot
75c1a4bac3 Disabling E-nets after admin discussion. 2014-07-23 21:26:12 -07:00
DJSnapshot
25bd9c3187 fixes #4961 2014-07-23 21:12:03 -07:00
DJSnapshot
f8d478fcbb Updates to gun targeting UI. Fixes #5710 2014-07-23 20:51:58 -07:00