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
Loganbacca
99f755b986
Cargo train fixes
...
- Adds overlay for cargo tug sprite
- Fixes failure feedback when successfully loading items on the train
- Stopped unnecessary loading failure feedback (like loading floors on trains, which will always fail)
- Stopped "hit" message when relabeling with the hand labeler
2014-07-26 17:55:30 +12:00
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
JimTheCactus
b0db2ba347
Added check for blank on name entry
...
Since cancel just returns a blank this checks for that and doesn't raise an error.
2014-07-25 19:36:58 -06: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
Chinsky
1e1d5a6d01
Enables logging of people beating monkey.
...
Also updates it to species code and visible message helper. Shit is anicent.
2014-07-26 04:09:20 +04: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
Ccomp5950
2acf93215b
Added . and # prefix to language keys checks (like radios)
...
Fixes #5748
2014-07-23 21:58:50 -05:00
mwerezak
78e4e259db
Fixes icons not being updated for necrosis
2014-07-23 22:41:52 -04:00
mwerezak
d9f70c2fd2
Adjusts the rate that infections deal toxin damage
2014-07-23 22:35:04 -04:00
mwerezak
60c6a2ea92
Fixes fever temperature not being reached
2014-07-23 22:34:04 -04:00
Mark Aherne
d0e01f70cc
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-07-23 21:58:13 +01:00
Meyar
7d07748b78
Added detective jobslot.
2014-07-23 14:33:10 -04:00
Chinsky
5c04ac9891
Merge pull request #5732 from PsiOmegaDelta/VentsScrubbers
...
Vents, scrubbers, freezers, more - OCD
2014-07-23 21:07:44 +04:00
Chinsky
db95401506
Merge pull request #5735 from Mloc/bs12-power
...
XGM gas mixtures
2014-07-23 21:05:56 +04:00
Mark Aherne
c3f62d4f52
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-07-23 14:37:10 +01:00
Zuhayr
61d38a3e86
Merge pull request #5740 from Ccomp5950/taser_slow_down
...
Tasers will now cause movement slow downs on the first hit
2014-07-23 17:46:55 +09:30
Ccomp5950
fe9785d630
Tasers will now cause movement slow downs on the first hit
...
Before: Tasers do 40 halloss damage and that drops to 39 on next life() tick so most people won't be slowed down by the first taser hit.
After: If you have any halloss you will slow down some. I've set it at 1 delay for every 10 halloss, this might need adjusting (15 instead of 10 possibly)
2014-07-23 02:55:37 -05:00
Ccomp5950
98abc5bfc4
Compromise on speach_sound, will check distance instead of just checking if ghost.
2014-07-23 01:48:48 -05:00
Ccomp5950
569e8361dc
Crew Monitor will no longer show "weird characters"
...
It has been talked to and feels very sorry for it's actions.
Well that and NanoUI doesn't like byond text-macros (/improper) in this case, so we just sanitize it just incase the crew monitor isn't playing nice that day.
2014-07-22 20:21:22 -05:00
