cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-18 14:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,918 Commits 8 Branches 0 Tags
014729a001b51af3a665684fbe68a3c3e3489ef1
Commit Graph

16446 Commits

Author SHA1 Message Date
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
Mloc
52d9004570 fixes #6301 
fixes sdisability genes in general

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-08 10:21:36 +01:00
Zuhayr
31a12a144d Merge pull request #6624 from PsiOmegaDelta/Vox 
Fixes #6609, supplements #6610
 2014-10-08 17:10:02 +10:30
Zuhayr
a730561b76 Merge pull request #6621 from Raptor1628/master 
Custom item fixes/adjustments
 2014-10-08 00:30:24 +10:30
Zuhayr
51e7f95b72 Merge pull request #6610 from SparklySheep/patch-7 
Replaces Vox telebaton with a stun baton
 2014-10-08 00:30:02 +10:30
PsiOmega
02717d263a Fixes #6609, supplements #6610 
Haphazardly adds a cell charger and normal recharger to the vox skipjack, along with an extra screwdriver.
Vox and Syndicate armor siemens coefficient changed to match ERT.
Replaced all mapped instances of the stunbaton to loaded variants. Gave people on the Research Outpost a way to recharge their baton.
 2014-10-07 15:05:41 +02:00
PsiOmega
684a69d03d Air horn replacement 
The default sound for announcements is now one which does not wreck headset users.
 2014-10-07 13:29:03 +02:00
PsiOmega
66483cf6dd Completes the transfer to the refreshed announcement system. 2014-10-07 13:19:20 +02:00
Mloc
0d27fd33cc fixes #4153 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-07 09:33:31 +01:00
Raptor1628
0314cbd8d1 Custom item fixes/adjustments 
Polishes a few sprites and item defines.
 2014-10-06 22:49:02 -04:00
Snapshot
ee72baac69 Merge pull request #6618 from Zuhayr/dev 
Bunch of minor fixes for xenomorphs and borer husks.
 2014-10-06 16:36:30 -07:00
Zuhayr
431a7474ea Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-07 10:06:17 +10:30
Zuhayr
8841e9282f Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-10-07 10:06:03 +10:30
Zuhayr
2b3e3667d4 Minor fixes for previous commit, implemented default species languages. 2014-10-07 09:51:48 +10:30
Zuhayr
96e57fc091 Bunch of minor fixes for xenomorphs and borer husks. 2014-10-07 08:54:05 +10:30
Snapshot
d51bcd12cc Merge pull request #6614 from PsiOmegaDelta/CancelTracking 
Fixes #6180
 2014-10-06 08:06:48 -07:00
Snapshot
5c84195e51 Merge pull request #6600 from PsiOmegaDelta/CryoBag 
Cargo can now order body/stasis bags
 2014-10-06 07:38:38 -07:00
PsiOmega
d6030024d1 Fixes #6180 
Changing AI eye location now disables tracking by default, unless explicitly stated otherwise.
 2014-10-06 15:57:52 +02:00
Zuhayr
df038c9fe8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-06 20:15:59 +10:30
Zuhayr
d0b3a3a39b Merge pull request #6601 from Mloc/bs12-calert 
donut boxes now update their icon to properly reflect their contents
 2014-10-06 19:37:24 +10:30
Mloc
056fbd79d1 fixes #6599 
also small improvements to the loadout system

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-06 09:57:01 +01:00
PsiOmega
c94375acdb Cargo can now order body/stasis bags. 2014-10-06 08:09:28 +02:00
SparklySheep
9efc817896 Replaces Vox telebaton with a stun baton 
Since the telebaton nerf, the vox lost their ability for stuns so this should give them the ability to whack folks and take prisoners again. As well, the telebaton was pretty worthless as a weapon.
 2014-10-05 23:17:17 -05:00
Mloc
9faec14707 donut boxes now update their icon to properly reflect their contents 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-05 19:24:30 +01:00
Zuhayr
77917fb2c4 Merge pull request #6584 from Iamgoofball/patch-6 
quick fix for #6498
 2014-10-05 10:10:50 +10:30
Chinsky
41ce4fc57d Merge pull request #6588 from RavingManiac/dev 
Sniper scope improvements, binoculars
 2014-10-05 03:37:33 +04:00
Zuhayr
fe950a6457 Merge pull request #6589 from Gamerofthegame/Project-Thief 
Project thief
 2014-10-05 10:05:39 +10:30
GinjaNinja32
a1c12bdaab Fixes #6591 2014-10-04 18:23:29 +01:00
GinjaNinja32
24d43ef509 Fixes #6597 2014-10-04 18:15:13 +01:00
GinjaNinja32
9ac8f3ccef Fixes #6587 and #6590 2014-10-04 17:57:37 +01:00
RavingManiac
756e9ae030 Zooming with an item is now done with a general proc zoom(). This applies to binoculars and sniper rifle. 2014-10-04 17:38:38 +08:00
Chinsky
06126c4f69 Merge pull request #6594 from mwerezak/runtime 
Fixes #6592
 2014-10-04 13:03:58 +04:00
mwerezak
d721673d8d Fixes #6592 2014-10-04 02:11:51 -04:00
mwerezak
db113115c6 Allows removing passengers through maint protocols 2014-10-04 02:07:15 -04:00
Gamerofthegame
40b73c5538 Fixes compile error 2014-10-03 17:24:40 -04:00
Gamerofthegame
447083d94c Adjusts bomberjacket 2014-10-03 16:11:11 -04:00
RavingManiac
2aab019cba Binoculars zoom no longer a right-click menu option. Already supplanted by attack_self(). 2014-10-04 04:05:26 +08:00
Gamerofthegame
a47ec82103 Merge repair 2014-10-03 16:04:31 -04:00
RavingManiac
f0da0380a5 Sniper rifle zoom now adds a client.pixel_x/y offset in addition to zoom. Currently 11 tiles in the direction the user is facing. Zooming can now be done through the right-click menu. 
Binoculars added. Functionally similar to sniper scope. Adminspawn-only as of this commit.
 2014-10-04 04:01:56 +08:00
Snapshot
9162a183eb Merge pull request #6586 from Mloc/bs12-fan 
fixes #6035
 2014-10-03 07:32:42 -07:00