cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,380 Commits 6 Branches 0 Tags
c1b3e935d6e64cd3df9e546e7b88e378bce84405
Commit Graph

10471 Commits

Author SHA1 Message Date
Chinsky
c1b3e935d6 Backwards check fixed 2015-03-30 23:28:30 +03:00
Chinsky
5429378703 Added check for second pAi for #8287 2015-03-30 22:55:17 +03:00
Chinsky
c0b62fd94a Fixes #8488 2015-03-30 22:32:52 +03:00
Chinsky
1a94b6cc35 Fixes #8393 2015-03-30 22:26:46 +03:00
Chinsky
246fc62b1c Whoops missed a bracket 2015-03-30 22:23:29 +03:00
Chinsky
1e6e7b0146 Fixes #8580 
Also fixed condition thing where having second pistol would lower chance of main one going off
 2015-03-30 22:08:08 +03:00
Chinsky
1a93042226 Fixes #8548 
Removed referenced to type of ammo used from descriptions.
 2015-03-30 22:06:29 +03:00
Chinsky
40cf940f13 Fixes #8564 2015-03-30 22:04:13 +03:00
Chinsky
e3ad4dc013 Fixed #8602 2015-03-30 21:59:50 +03:00
Chinsky
dfdea36479 Fixes #8642 2015-03-30 21:36:41 +03:00
Chinsky
5837eb2675 Merge pull request #8668 from Yoshax/dev-freeze 
Fixes #8652
 2015-03-30 19:40:13 +03:00
PsiOmegaDelta
fefb55db93 Merge pull request #8674 from GinjaNinja32/rig_guns 
Rig weapon fixes
 2015-03-30 15:02:22 +02:00
GinjaNinja32
e342bf8a3a Fixes #8673, also makes some messages clearer and removes the twin cooldowns on rig weapons 2015-03-30 03:54:18 +01:00
Zuhayr
2f60c4b82d Merge pull request #8638 from Zuhayr/vox 
Removes the vox armalis.
 2015-03-30 08:56:34 +10:30
Yosh
e4b827134e Fixes #8652 
Fixes #8652
Took me long enough, I'm pretty retarded, and to answer Psi's question,
yes, this fixes it.
 2015-03-29 23:19:21 +01:00
PsiOmega
59638b2300 Fixes #8661. 
Now ghosts the AI before it's deleted, setting the respawn timer.
 2015-03-29 16:53:48 +02:00
GinjaNinja32
e7b4370772 Fixes #8650 2015-03-28 22:01:02 +00:00
Chinsky
3cd206535a Merge pull request #8639 from mwerezak/holocarp-fix 
Holopad fix, makes holodeck objects slightly transparent
 2015-03-27 20:57:30 +03:00
mwerezak
486940c9e0 Makes holo objs slightly transparent 2015-03-27 10:32:41 -04:00
Zuhayr
59adbae59e Removes the vox armalis. 2015-03-27 16:41:32 +10:30
PsiOmegaDelta
ce414b2eba Merge pull request #8637 from mwerezak/holocarp-fix 
Fixes holocarp not being transparent
 2015-03-27 07:07:20 +01:00
mwerezak
872e0a0e84 Fixes holocarp not being transparent. 2015-03-27 01:36:36 -04:00
GinjaNinja32
05f9411910 Fixes webbings utilising bluespace storage for infinite storage (again) 2015-03-27 03:06:29 +00:00
Zuhayr
dda3fc8f02 Merge pull request #8469 from mwerezak/robot-emp 
Reduces the effect of EMP on robot power cells, some other things
 2015-03-26 19:00:39 +10:30
PsiOmegaDelta
447cbab45f Merge pull request #8613 from mwerezak/gun-rewrite 
Adjusts ammo autolathe costs
 2015-03-24 21:54:49 +01:00
Zuhayr
0bb2cd835c Merge pull request #8600 from mwerezak/bread-tube 
Adds bread tube trash item, merc shuttle vendor
 2015-03-25 00:54:16 +10:30
mwerezak
1ce81b91b1 Adds bread tube trash item 2015-03-24 04:03:06 -04:00
mwerezak
113498dc1e Makes bread tube nutriment content similar to comparable snacks 2015-03-24 03:57:17 -04:00
Zuhayr
7e615521ef Should fix issues with invisible seeds/products/plants. 2015-03-24 13:51:44 +10:30
Zuhayr
45f28d5372 Fixes #8485 2015-03-24 13:20:24 +10:30
Zuhayr
ef50918b9c Hackfix for #8588 2015-03-24 12:46:07 +10:30
PsiOmega
bd48c76620 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-23 21:14:32 +01:00
PsiOmegaDelta
c85e1ce786 Merge pull request #8592 from comma/maxlen 
Readded missing check for paper editing
 2015-03-23 21:13:43 +01:00
Chinsky
a9ee51bc64 Readded missing check for paper editing 
Removed it back when HTML in paper was a thing again adn never put back in, can possibly cause issues.
Thanks @volas for noticing.
 2015-03-23 23:02:43 +03:00
mwerezak
f8eb5ccb97 indent fix 2015-03-23 13:04:39 -04:00
Zuhayr
14950a7e3a Merge pull request #8584 from Kelenius/ofBorgsAndGlass 
Fixed construction borg's Rglass
 2015-03-23 21:34:36 +10:30
PsiOmega
1908ba59e2 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-23 11:45:32 +01:00
Kelenius
026ec265d4 Fixed construction borg's Rglass 2015-03-23 12:11:58 +03:00
mwerezak
dc1f05a9da Tweaks rig emp effect, breach_threshold 2015-03-23 02:49:34 -04:00
mwerezak
ceaa938b89 EMP deals burn instead of brute to silicons, and bypasses robot armour 2015-03-23 02:47:05 -04:00
mwerezak
28df26b36c Reduces the effect of EMP on robot power cells 
Temporary fix to resolve #8454
 2015-03-23 02:34:17 -04:00
mwerezak
8ff15108f9 Reduces 14.5mm ammo box cost to 2 TC, slight rename 2015-03-23 00:16:48 -04:00
mwerezak
a60921326e Adjusts ammunition autolathe costs, makes 7.62 mags printable 2015-03-23 00:06:28 -04:00
Zuhayr
1474c6fdd1 Merge pull request #8574 from PsiOmegaDelta/AIDel 
Deletes AI eye along with the AI.
 2015-03-23 10:54:36 +10:30
Chinsky
f4dd077d50 Merge pull request #8571 from PsiOmegaDelta/EyeFix 
Fixes #8534.
 2015-03-22 21:47:17 +03:00
PsiOmega
767f4dd537 Deletes AI eye along with the AI. 2015-03-22 18:51:15 +01:00
PsiOmega
f9b8c2dbc9 Fixes #8534. 
Sets icontype to its proper value.
 2015-03-22 16:25:24 +01:00
Zuhayr
8791c2bf1e Fixing a typo. 
! and ~ both compile. Feh.
 2015-03-23 00:05:29 +10:30
Zuhayr
9deebbf9f6 Vines should now respect coverage and magboots. 2015-03-22 16:25:22 +10:30
Zuhayr
bf8ad6d585 Rebalanced xenoflora sprites, fixed numerous issues. 2015-03-22 16:13:15 +10:30