cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,522 Commits 5 Branches 0 Tags
0c84b3284723fad5ce05f5691896a6a93b4ef640
Commit Graph

15335 Commits

Author SHA1 Message Date
Chinsky
d4b7e2d84b Merge pull request #6709 from Mloc/bs12-server 
testing fix for nui resources
 2014-10-14 01:14:54 +04:00
Miniature
1bb1045eeb Fix biosuits hiding shoes when they should not, #6691 2014-10-14 06:29:40 +10:30
Mloc
c6c691bfd9 fixes #6299 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-13 20:35:56 +01:00
Miniature
894ae39f7f Fix for everyone dying if they don't eat 2014-10-14 05:36:47 +10:30
Mloc-Argent
61839da570 testing fix for nui resources 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-10-13 20:01:54 +01:00
Zuhayr
01ddc9af6d Added binary to the AI. 2014-10-13 17:39:00 +10:30
Zuhayr
4c070bad02 Bunch of xeno fixes, details in PR. 2014-10-13 17:32:13 +10:30
Zuhayr
c5e2fa74e6 Fixes #6689 2014-10-13 17:16:23 +10:30
Zuhayr
06ad91f417 Fixes #6695 2014-10-13 17:00:26 +10:30
Zuhayr
45d6d6a610 Added Galactic Common to the AI. 2014-10-13 16:45:58 +10:30
Snapshot
9a706864b3 Merge pull request #6688 from Zuhayr/dev-freeze 
Dev freeze fixes
 2014-10-12 18:07:34 -07:00
Zuhayr
cd2b5e761d Fixes being unable to knock on windows. 2014-10-13 11:21:37 +10:30
Zuhayr
fa51820244 Fixes #6684 2014-10-13 11:19:12 +10:30
Zuhayr
9c39936640 Fixes #6682 2014-10-13 11:10:46 +10:30
DJSnapshot
b53a89e608 disable typing indicator. 2014-10-12 17:22:30 -07:00
PsiOmega
36abc43a7a Map alterations. Fixes #6677. 
Re-organizes maintenance areas, adds missing air alarms, lights and cameras to substations.
Re-adds a number of suddenly missing power cables, mainly affecting security.
Replaces a few instances of blood on the station with oil. Having round-start blood in secluded areas would get annoying fast..
 2014-10-12 12:44:13 +02:00
PsiOmega
988d07cefe Hopefully fixes #6674 
Breaker boxes would not always place down all the cables necessary to connect power grids on server start.
Moving initialization from the New() to the initialize() appears to have resolved this.
 2014-10-12 12:41:38 +02:00
Zuhayr
413af81b80 Fixes humans being able to shred everything with their teeth. 2014-10-12 13:28:46 +10:30
Zuhayr
c9e948095c Thought I had done these before, turned out I did. Single-linebreak conflicts woo. 2014-10-12 11:55:33 +10:30
Zuhayr
5989a0c625 Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it. 2014-10-12 11:48:54 +10:30
Zuhayr
72924e80a5 Merge pull request #6666 from GinjaNinja32/nanoui 
Move NanoUI cache update to client/New()
 2014-10-12 04:40:34 +10:30
Gamerofthegame
be8c62de7b Merge 2014-10-11 13:58:16 -04:00
GinjaNinja32
08b967c9e0 Move NanoUI cache update to client/New() 2014-10-11 18:40:09 +01:00
Chinsky
d3e19fb25a Merge pull request #6652 from PsiOmegaDelta/Centcom 
Fixes #6648
 2014-10-11 02:46:49 +04:00
Chinsky
3918518f5f Merge pull request #6653 from GinjaNinja32/sleeper 
Fixes runtime caused by missing check in sleeper code
 2014-10-11 02:46:44 +04:00
Chinsky
513df67d5f Merge pull request #6650 from mwerezak/grab 
Fixes #6647
 2014-10-11 02:44:59 +04:00
Zuhayr
9b23315359 Fixes #6644 2014-10-11 07:44:48 +10:30
Zuhayr
d278e496ee Fixes #6645 2014-10-11 06:58:44 +10:30
Zuhayr
3fc7414cfd Fixes #6656 2014-10-11 06:52:20 +10:30
Zuhayr
92c92753fb Manual icon file merge. 2014-10-11 06:40:36 +10:30
Zuhayr
d858f0fa01 Merge pull request #6638 from mwerezak/exo-suit 
Fixes #6622
 2014-10-11 06:07:20 +10:30
Hubblenaut
37b7c17abd Tweaks and improvements to cards 2014-10-10 18:22:29 +02:00
GinjaNinja32
1052c9a476 Fixes runtime caused by missing check in sleeper code 2014-10-10 15:53:11 +01:00
PsiOmega
b124644df4 Less relative paths. Less type checks. 2014-10-10 16:22:36 +02:00
mwerezak
7a81e116d2 Fixes #6647 
grabbed_by assignment is now done in the grab constructor, instead of
leaking out all over the place.
 2014-10-10 00:23:03 -04:00
Snapshot
e67e37b010 Merge pull request #6640 from Mloc/bs12-overflow 
fixes #6200
 2014-10-09 20:44:25 -07:00
Zuhayr
4223cc6596 Merge pull request #6642 from DeeUnderscore/fix-disposal-bin 
Fix detached disposal bins never changing to attached
 2014-10-10 09:31:28 +10:30
D Anzorge
7c8e810774 Fix detached disposal bins never changing to attached 2014-10-09 08:09:04 -04:00
Mloc
5b71ca0aeb fixes #6200 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-09 12:35:11 +01:00
PsiOmega
3560531d58 Silicons attempting to delete camera images no longer causes runtime errors 2014-10-09 08:21:07 +02:00
mwerezak
cfd5bcb576 Force removing a passenger now has a delay 2014-10-09 00:33:59 -04:00
mwerezak
b774d35ebc Fixes #6622 
Toggling passenger compartment locks now displays a message.
 2014-10-09 00:33:40 -04:00
Gamerofthegame
02d539eb99 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into working 2014-10-08 18:48:59 -04:00
Zuhayr
a8964b0435 Removed Taj hackfix 2014-10-09 06:20:15 +10:30
Zuhayr
4e5d8b787e Minor change based on diff 2014-10-09 06:18:49 +10:30
Gamerofthegame
dd32255c0f Adds another AI sprite 2014-10-08 14:39:02 -04:00
Chinsky
647568020a Merge pull request #6631 from Mloc/bs12-overflow 
fixes #6301
 2014-10-08 21:05:08 +04:00
Zuhayr
d3566ecd62 Temp fix for Tajaran > Tajara breaking the whitelist. 2014-10-08 23:41:11 +10:30
Zuhayr
37cb78eefa Fixes #6613 and #6492 2014-10-08 23:10:12 +10:30
Zuhayr
1249fb0592 Fixes #6628 2014-10-08 21:18:00 +10:30