cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,511 Commits 8 Branches 0 Tags
2fd0f24c0d33a42c6fa37ab80d146f54c60e437d
Commit Graph

13779 Commits

Author SHA1 Message Date
Zuhayr
2fd0f24c0d Merge pull request #5708 from Walter0o/pai_lang_fix 
adds proper pAI language based translator
 2014-07-21 16:00:58 +09:30
Zuhayr
14b3c87aef Merge pull request #5701 from Walter0o/shameful_dispray 
fixes simple_animals using FEA instead of ZAS
 2014-07-20 23:51:12 +09:30
Chinsky
0ac240f4f8 Merge pull request #5669 from atlantiscze/laptop-multifix 
Laptop MultiFix
 2014-07-20 17:58:24 +04:00
Chinsky
02227d9da7 Merge pull request #5700 from Whitellama/master 
Bug fixes: #5697, #5690, #5687, #5685
 2014-07-20 17:42:23 +04:00
Chinsky
ad4d884127 Merge pull request #5702 from Walter0o/borer_fixes 
Borer fixes
 2014-07-20 17:41:40 +04:00
Atlantiscze
c127fee6b4 Adds battery status icon to NTOS 
- Laptops now have status icon which shows status of their internal battery.
- Adds support for "status bar" - allows more status icons in future (such as, network connection? time? whatever), status bar icons should be 16x16px
 2014-07-20 15:15:29 +02:00
Walter0o
a8e30ed1fa makes Siik'tajr understandable but not speakable for pAIs 2014-07-20 09:33:06 +02:00
Walter0o
855fcbae6d forgot removal of this marker 2014-07-20 09:24:59 +02:00
Walter0o
7dff5f117e adds proper pAI language based translator, 
reverts UNTRANSLATABLE
 2014-07-20 09:05:44 +02:00
Walter0o
3334900987 adds trim() to OOC and LOOC 2014-07-20 06:57:57 +02:00
Walter0o
9be8f496ae borer detatch fixes 2014-07-20 04:42:14 +02:00
Walter0o
70b1d8dc65 borer detatch fixes 2014-07-20 04:40:58 +02:00
Walter0o
4c6017cfaa fixes borer infest and detatch 2014-07-20 04:37:42 +02:00
Walter0o
fced496980 fixes simple_animals using FEA instead of ZAS 
i can't believe after all this time animals still use FEA instead of ZAS.
this should fix the "random" animal deaths.
 2014-07-20 04:21:48 +02:00
Whitellama
266d8d25fa Fixed #5685: Changelings now gain the species needed to transform when acquiring DNA using the extract DNA sting 2014-07-19 19:11:30 -07:00
Whitellama
342a187c8b Eating with utensils now produces the eating sound, fixed #5687 2014-07-19 18:33:30 -07:00
Atlantiscze
69ab22896b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into laptop-multifix 2014-07-20 02:07:15 +02:00
Atlantiscze
06dcb07fb8 Merge branch 'laptop-multifix' of https://github.com/atlantiscze/Baystation12 into laptop-multifix 2014-07-20 01:55:42 +02:00
Atlantiscze
5cfe7d9dd8 Fixes #5670 
- This also includes other vending machines than laptop vendor. They now actually take money from your account instead of pretending to do so and giving stuff for free. No moar spess communism.
- Vending machines now ask for PIN code only if your account settings require it (ie: Security levels 1 or 2. Default is 0 - only ID card swipe)
 2014-07-20 01:55:11 +02:00
Whitellama
eb2ec42345 Fixed #5697, grammatical error with empty glasses, cans, condiment containers 2014-07-19 16:22:09 -07:00
Zuhayr
ff556316a8 Merge pull request #5679 from mwerezak/wound-infections 
Removes organ_failure random event
 2014-07-19 12:32:50 +09:30
Mloc-Hibernia
ccc73ddf69 modularize ban system 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2014-07-18 21:08:01 +00:00
Chinsky
f83b9b4eed Merge pull request #5681 from mwerezak/looc 
Fixes #5666
 2014-07-19 00:33:08 +04:00
mwerezak
b3a99cefcf Fixes #5666 2014-07-18 16:16:43 -04:00
mwerezak
9825968880 Fixes lingering reference to organ_failure 2014-07-18 12:02:39 -04:00
mwerezak
9b71eb1fe6 Removes organ_failure random event 2014-07-18 11:40:49 -04:00
Mloc
01c5025af6 Merge pull request #5672 from mwerezak/docking 
Docking controllers updates
 2014-07-18 12:58:11 +01:00
Mloc
6efff01110 Merge pull request #5671 from mwerezak/silicon-lang 
Removes Rootspeak from AI and robot languages
 2014-07-18 12:55:49 +01:00
Atlantiscze
95a45a646f Fixes #5572 
- Detective-vended laptops now have medical records program installed.
 2014-07-18 12:14:33 +02:00
Zuhayr
9401dcf13c Fixes bug with drone Bump() check 
They can now use teleporters, hand tele portals and the disposals chute.
 2014-07-18 19:13:24 +09:30
mwerezak
7361c7da45 Loosens the undocking requirements for airlocks 2014-07-17 22:03:05 -04:00
mwerezak
3ea7e0ce3c Adds a name for the escape pod controller 2014-07-17 20:07:13 -04:00
mwerezak
21b2742086 Adds default values for some docking tags 
Simplifies the mapping of docking controllers by cutting down on the
number of tags needed to be entered.
 2014-07-17 20:01:20 -04:00
mwerezak
3209cb49a6 Removes Rootspeak from AI and robot languages 2014-07-17 19:30:00 -04:00
Atlantiscze
1e512fdde2 Fixes #5569, Fixes #5571 
- Reworked card reader code, it's cleaner and less copypaste now
- Updated medical records, security records and HoP card computer to work with the update. It's however possible i missed something, can't go through all computers in game. Tell me if you find something that's broken due to this, i will fix it ASAP.
- Security records color for "none" security status changed a bit so it doesn't burn eyes of anyone trying to  read it (issue #5571 - white on light green? Bad choice imo)
- Multi-card readers now actually WORK for laptops. This includes security records (issue #5569) and medical records (same case, just not reported). You still have to insert your card into read slot, if you insert it into wrong slot notification will be shown that you should use read slot instead of write one.
 2014-07-18 00:47:39 +02:00
Atlantiscze
4096b26c8d Fixes #5553 
Camera network key itself is useless without security camera program. Created hidden version of this program and added it to each laptop. In short: it works.
 2014-07-17 19:03:31 +02:00
Atlantiscze
72dbce88ce Fixes #5570 
Also de-copypasted charger code, as i had the opportunity.
 2014-07-17 18:01:19 +02:00
Zuhayr
73d3883da3 Merge pull request #5652 from comma/master 
Couple xenoarch fixes
 2014-07-17 23:56:18 +09:30
Chinsky
248affdebe Merge pull request #5656 from mwerezak/wound-infections 
Infection system tweaks
 2014-07-17 15:39:16 +04:00
Chinsky
e2e944dc66 Merge pull request #5655 from Walter0o/patch-2 
should fix #5618, trivial kitchen utensil bug
 2014-07-17 15:38:42 +04:00
Atlantiscze
386b1e6ce4 Bugfix - cable coil now shows correct transferred amount. 2014-07-16 22:59:14 +02:00
mwerezak
1eee72d118 Updates body scanner readout for internal organs 2014-07-16 15:59:18 -04:00
mwerezak
13b757938d Infections raise temperature faster wrt germ_level 2014-07-16 15:52:42 -04:00
mwerezak
d6a070e6fc Improved full body scanner infection readout 
Now provides a higher level of precision on infection severity.
 2014-07-16 15:44:16 -04:00
Walter0o
6c62e9e56b should fix #5618, trivial kitchen utensil bug 2014-07-16 20:28:19 +02:00
Mloc
3d7fac2555 Merge pull request #5628 from Zuhayr/master 
Made Vox-Pidgin and Rootspeak untranslatable even by pAIs.
 2014-07-16 14:39:38 +01:00
Walter0o
8baf6e4661 another missing battery check 2014-07-16 15:20:23 +02:00
Walter0o
9d3a87115a missing power check 
people could still use this without any charge
 2014-07-16 15:13:13 +02:00
Chinsky
4c4c248a72 Merge pull request #5623 from Decius-R/aeneas_labcoat_edit 
Changes labcoat sprite to be closed on custom item...
 2014-07-16 16:23:43 +04:00
Chinsky
61f8713941 Possible fix for #5645 
I think issue is that harvester won't forget what artifact it is using until harvesting process is started.
 2014-07-16 16:22:26 +04:00