Zuhayr
b411da44b8
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-09-30 23:23:05 +09:30
Chinsky
db19505e10
Merge pull request #6544 from Jarcolr/customis
...
Adds *5* approved custom items to code
2014-09-30 12:21:04 +04:00
Gamerofthegame
33b9d19df1
Commit repair
2014-09-28 17:13:42 -04:00
Hubblenaut
c783549015
Option to withdraw chargecard or cash at ATM
2014-09-28 21:53:19 +02:00
Hubblenaut
e7620cd81a
Spacecash is now stackable and called 'Thalers'
2014-09-28 21:52:56 +02:00
Jarcolr
6a3f5d24d8
Adds 5 approved custom items to code
...
http://baystation12.net/forums/viewtopic.php?f=33&t=11097
http://baystation12.net/forums/viewtopic.php?f=33&t=11138
http://baystation12.net/forums/viewtopic.php?f=33&t=11300
http://baystation12.net/forums/viewtopic.php?f=33&t=11337
2014-09-28 21:31:24 +03:00
Chinsky
6eea41bcc1
Merge pull request #6535 from Hubblenaut/master
...
Fixes rolled down jumpsuits not adjusting body flags
2014-09-28 21:22:00 +04:00
Zuhayr
97801b4617
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-09-29 00:39:43 +09:30
Hubblenaut
79c0d3470a
Fixes non-used flavor text causing line breaks
2014-09-28 15:48:39 +02:00
Hubblenaut
1212338c2e
Fixes rolled down jumpsuits now adjusting body flags
2014-09-28 15:48:38 +02:00
Zuhayr
afdcb1f564
Merge pull request #6518 from faerindel/adv_scanner_print
...
Adds printing occupant status option to bodyscanners.
2014-09-28 22:15:15 +09:30
Zuhayr
9a01da0519
Merge pull request #6437 from atlantiscze/Supermatter-O2-Fix
...
Supermatter Tweak
2014-09-28 22:12:21 +09:30
Chinsky
a2351ab952
Merge pull request #6529 from mwerezak/language
...
Fixes #6520
2014-09-27 14:21:29 +04:00
mwerezak
7a2b3b6661
Fixes #6520
2014-09-27 03:00:26 -04:00
Mordeth221
4e8f57cd2d
Added helm for use in events and other things
2014-09-26 17:30:41 +01:00
igalan
52caa42e8e
Split fetching data and its formatting to separate procs.
2014-09-26 00:50:05 +01:00
Zuhayr
cc52be3192
Merge resolution, replaced 2 wires lost in map merge.
2014-09-25 23:54:24 +09:30
Zuhayr
b78e2b0c79
Fixes #6297
2014-09-25 21:49:20 +09:30
Zuhayr
9272bc4542
Fixes #6351 and #6350 .
2014-09-25 21:19:35 +09:30
Zuhayr
c232b4e921
Fixes #5451 by stealing JimTheCactus' and VampyrBytes' work - thanks dudes.
2014-09-25 20:07:11 +09:30
Zuhayr
cddbce688d
Fix for potential infinite splint farming exploit in previous commit.
2014-09-25 19:43:17 +09:30
Zuhayr
e41c584ace
Fixes #6325
2014-09-25 19:33:46 +09:30
Zuhayr
6bdf515ef3
Makes species mutation a bit easier.
2014-09-25 18:48:29 +09:30
Zuhayr
7682711442
Fixes #6474
2014-09-25 18:45:27 +09:30
Zuhayr
8e9fc05b67
Fixes #6484
2014-09-25 18:36:25 +09:30
Zuhayr
b32d25b1bd
Fixes #6503
2014-09-25 18:01:46 +09:30
Zuhayr
4e6afd282c
Fixes #6488
2014-09-25 17:59:28 +09:30
Chinsky
69ed2317bf
Merge pull request #6428 from atlantiscze/cyborg-power
...
Cyborg power overhaul
2014-09-25 00:19:13 +04:00
Atlantiscze
e7f3533158
Cyborg Lights
...
- Cyborg lights now use the reworked power system.
- Removed flashlight from cyborg modules, replaced with integrated light.
- "toggle-lights" verb is added for cyborgs, which de/activates the integrated light. Uses 30W (*modifier) of power when active.
- Cyborg lights have luminosity of 6 (flashlight has 4).
2014-09-24 09:41:19 +02:00
Zuhayr
0c83a95b90
Large merge resultion. Used remote for map conflicts.
2014-09-23 21:41:54 +09:30
Zuhayr
29c29cd408
Merge pull request #6482 from PsiOmegaDelta/pAI
...
pAI submission process change
2014-09-23 18:33:38 +09:30
Chinsky
7fcc04dc90
Merge pull request #6467 from mwerezak/stungloves
...
Removes Stungloves
2014-09-21 23:19:15 +04:00
Chinsky
1d3b1e6467
Merge pull request #6483 from GinjaNinja32/shelf
...
Fix for non-cancelable book removal from bookshelves
2014-09-21 23:18:42 +04:00
Chinsky
c46067ff59
Merge pull request #6472 from mwerezak/evidence-bags
...
Fixes Evidence Bags
2014-09-21 23:15:36 +04:00
GinjaNinja32
91a4bc356e
Fix for non-cancelable book removal from bookshelves
2014-09-21 16:04:22 +01:00
PsiOmega
1e81d002aa
pAI submission process change
...
Attempts to fix #6481 .
Previously it appears observers would be asked once, and only once, if they wished to become a pAI.
If one closed the configuration window without pressing Submit you'd never get the chance to apply again.
Now asks observers every time someone requests a pAI, similar to posibrains and Dionaea pods.
There is already a built-in ask delay of one minute between such requests and ghosts can decide to opt out for the rest of the round.
2014-09-21 15:13:48 +02:00
Chinsky
77d45e8b4c
Merge pull request #6461 from atlantiscze/freezer-board-fix
...
Freezer Heater Board Fix + Runtime Hotfix
2014-09-20 21:20:28 +04:00
Chinsky
965516b5a2
Merge pull request #6468 from atlantiscze/emagged-borg-fix
...
Emagged Cyborg Fix
2014-09-20 09:12:30 +04:00
mwerezak
47a7b2cc17
Fixes #6459
2014-09-20 01:06:05 -04:00
Atlantiscze
312089d366
Emagged Cyborg Fix
...
- Emagged cyborgs now can select their special weapon.
2014-09-20 03:11:06 +02:00
mwerezak
c02574c8c7
Removes stungloves
2014-09-19 20:12:46 -04:00
Chinsky
9e2dcc4e4a
Merge pull request #6455 from Zuhayr/master
...
Calamity and hydro tweaks
2014-09-20 00:07:56 +04:00
Atlantiscze
16fe060f1a
Freezer Heater Board Fix
...
- Freezer/Heater circuit boards now have proper build paths in Research
2014-09-19 16:28:38 +02:00
Chinsky
1cb8a3ee15
Merge pull request #6454 from PsiOmegaDelta/pAI
...
Attempts to fix #6344
2014-09-19 10:49:21 +04:00
Walter0o
89f87d2dfb
borer restore and fixes
...
- tried to merge the upstream and my version for you as best as i could, my version does differs in quite a few places
- reactivates my ID and IP fixes, these are needed so an offline borer or host mob don't cause bans and multikey alerts to fuck up, worst case you perma a few innocent players thanks to lazy coding. also how could they possibly fuck up control transfer??
- fixes the client DC bug properly, caused by spawning the brainmob prematurely in New()
- removed the runtime-error-triggering organ check, all mob restriction checks if wanted should happen on infest
- adds say logging and missing input sanitation
next time please ask me if you have questions, instead of making master file accusation comments that i might never read.
2014-09-18 21:52:57 +02:00
Atlantiscze
1e946c4153
Adds two mwerezak's requests.
2014-09-18 19:23:00 +02:00
Zuhayr
4bedceca78
Hydro tweaks.
2014-09-18 21:45:12 +09:30
Zuhayr
39689f05c7
Removed borer from roundstart calamity, added it to the dynamic event handler. Increased event frequency.
2014-09-18 21:41:54 +09:30
PsiOmega
b56dfa34fe
Attempts to fix #6344
...
pAI configurations are not added to the list of available candidates.
2014-09-18 13:21:58 +02:00
PsiOmega
fe126626ac
Cleans up radio frequency numbers.
...
Replaces magic numbers across the code base with proper constants.
Prepares for the ability to have more than one antag channel in the future.
Corrects a lie.
2014-09-18 13:07:34 +02:00
