cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 10:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,326 Commits 7 Branches 0 Tags
9a8b9bcc6063da9ba72c374decc8a421fc550b71
Commit Graph

10024 Commits

Author SHA1 Message Date
ZekeSulastin
9a8b9bcc60 Added secondary language to char setup 
This allows for one secondary language to be selected per character.
Whitelisting is done in alienwhitelist.txt via ckey; language options
are specified by ckey - Language_Species, with Soghun for Unathi as with
the normal whitelist.
 2013-06-29 17:31:21 -04:00
Zuhayr
c10137a118 Fixes #3184 2013-06-29 19:08:41 -07:00
Zuhayr
6fc787ff73 Fixes #3201 2013-06-29 18:09:35 -07:00
Zuhayr
e87348dd8d Quickfix for #3194 2013-06-29 17:56:38 -07:00
Zuhayr
60eeccd2ed Fixes #3198 2013-06-29 17:27:46 -07:00
Zuhayr
3192323c19 Fixes #3200 2013-06-29 16:57:08 -07:00
Zuhayr
9b9cf6dfe0 Merge pull request #3190 from Kilakk/bleeding-edge-freeze 
Fixes #3188 - Mods can now see deadchat
 2013-06-28 23:06:26 -07:00
Zuhayr
1d28bb7cb3 Message tweaks. 2013-06-28 15:55:41 -07:00
Zuhayr
c7bbc3c9b3 Changelog. 2013-06-28 15:53:50 -07:00
Zuhayr
665bdd16ab Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-28 15:50:07 -07:00
Kilakk
6b5bd3ca8d Fixes #3188 - Mods can now see deadchat 
Mods can now see deadchat regardless of whether they're ghosted or not.
Works with the deadchat toggle.
 2013-06-27 23:45:17 -04:00
Zuhayr
58bf2d218c Bandages and ointment cannot be used through space suits. 2013-06-27 18:02:10 -07:00
Zuhayr
f5abc3e041 Syringes now have an increased delay when injecting through a hardsuit. 2013-06-27 17:59:37 -07:00
Segrain
4bcae3a06b Examine() update. 2013-06-28 03:33:06 +03:00
Chinsky
12a79e4ade Merge pull request #3181 from Zuhayr/master 
Fixes solar control and SMES for borgs.
 2013-06-27 16:12:17 -07:00
Zuhayr
6f207a3a14 Fixes #2424 2013-06-27 18:09:48 -07:00
Segrain
31e4487229 Fix for #2430. 2013-06-27 14:10:05 +03:00
Zuhayr
64dfca731b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-27 09:01:01 -07:00
Zuhayr
d89950487a Added a clot timer to wounds. If a wound is smaller than 30 damage, it will stop bleeding after <damage> seconds. More damage increases the counter. 2013-06-27 08:47:15 -07:00
Zuhayr
304be1fe41 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-27 07:27:38 -07:00
Zuhayr
5dbb0bcb87 Changelog. 2013-06-27 06:41:47 -07:00
Segrain
fa0e14652a Revive bugfix. 2013-06-27 02:20:19 +03:00
Zuhayr
6d46297757 Fixes #2947 2013-06-27 07:17:55 -07:00
Zuhayr
b41e92dc01 Fixes #2870 2013-06-27 07:01:42 -07:00
Zuhayr
8eec1d5379 Fixes #3008 2013-06-27 06:30:17 -07:00
Zuhayr
b270c6060d Fixes #3025 2013-06-27 06:22:01 -07:00
Zuhayr
333e59190c Added minimum damage for cutting wounds to bleed visibly. 2013-06-27 02:09:36 -07:00
Segrain
a944cda68e Autopsy fix. 2013-06-26 16:12:32 +03:00
Segrain
91ab249681 Helper update. 2013-06-26 16:11:10 +03:00
Zuhayr
e7cf8fa613 Adjustments to a wonky examine string for vox magboots. 2013-06-26 00:03:03 -07:00
Zuhayr
3c7bd1f527 Dartgun tweaks and vox raider spawn equipment changes. 2013-06-26 00:00:55 -07:00
Zuhayr
a877a2a9a8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-25 23:55:01 -07:00
Zuhayr
e363157b2a Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-25 23:54:47 -07:00
Zuhayr
722a336e2a Attempted fix to non-refreshing window. 2013-06-25 23:30:13 -07:00
Zuhayr
30cce4fc03 Fixes simple animal pinning. 2013-06-25 22:29:44 -07:00
Zuhayr
a0624c4c4d Fixes pinning without embedding. 2013-06-25 22:27:40 -07:00
Zuhayr
a0aa02b815 Fixes broken vox raid spawning, hopefully. 2013-06-25 22:15:32 -07:00
cib
b0cabba481 Fixed a severe bug with robot components. 
There were several desyncs between robot.cell and robot.components["power cell"].installed, leading to very annoying bugs.
 2013-06-25 15:00:58 +02:00
Segrain
29903c46e3 Quickfix for multitile doors. 2013-06-25 11:40:01 +03:00
Zuhayr
aa60c58ecb Allows robots to understand all alien languages. 2013-06-24 22:57:36 -07:00
Zuhayr
289bb33432 Merge branch 'feature' of https://github.com/Zuhayr/Baystation12 2013-06-24 21:07:57 -07:00
Zuhayr
479d7a058f Fixes #3154 2013-06-25 14:07:54 -07:00
Zuhayr
59119fea07 Fixes #3146 2013-06-24 22:09:03 -07:00
Zuhayr
2265e8e0b9 Fixes #2815 2013-06-24 21:55:21 -07:00
Zuhayr
b3ba567099 Fixes #3145 2013-06-24 21:31:38 -07:00
Zuhayr
f5cc695c19 Merged airlock assembly changes and ZAS changes, hopefully. 2013-06-24 21:06:51 -07:00
Zuhayr
bff96e3fb7 Added holobadges, Security-imprintable display accessories. 2013-06-24 20:55:24 -07:00
Zuhayr
12daf1f245 Merge pull request #3158 from Furlucis/master 
Again with the changeling stab aiming
 2013-06-24 20:45:25 -07:00
SkyMarshal
aa85e757d4 Added a better framework for multi-tile doors, pulling works strangely though. 2013-06-24 17:21:55 -07:00
Zuhayr
9f487038f2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-24 16:18:01 -07:00