cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-29 18:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,617 Commits 13 Branches 0 Tags
5fb4a26a0bb6a3e92e7760e2ce1091c2e2b29dde
Commit Graph

5510 Commits

Author SHA1 Message Date
Neerti
c7e9acbdad Merge pull request #1082 from Datraen/FlaregunMech 
Adds a mech flare launcher, can be mounted on any mech.
 2016-02-26 22:29:47 -05:00
Neerti
23b15390dd Merge pull request #893 from Kelenius/AIHud 
AI hud
 2016-02-26 20:31:40 -05:00
Datraen
0b4a730bbe Merge pull request #1083 from Kelenius/plzNoCard 
There is now a ten-second delay for carding the AI
 2016-02-26 14:36:50 -05:00
Hubblenaut
6ee464cae7 Merge remote-tracking branch 'upstream/master' into cash 2016-02-26 13:48:01 +01:00
Kelenius
e40a2b59ab There is now a ten-second delay for carding the AI 2016-02-26 11:02:53 +03:00
Datraen
47efe8d217 Gets rid of double emotes on pAIs and AIs. 2016-02-25 12:39:00 -05:00
Datraen
55a024ef14 Adds a mech flare launcher, can be mounted on any mech. 2016-02-24 21:15:48 -05:00
Hubblenaut
c22f9b2996 Merge remote-tracking branch 'upstream/master' into cash 2016-02-21 17:48:19 +01:00
Datraen
9d269ab470 Merge pull request #1033 from Yoshax/burnbabyburn 
Allows lighting of smokeables on burning people
 2016-02-21 11:32:16 -05:00
Datraen
f9054370c1 Merge pull request #1046 from Sabess/Sab_Thing 
Maglights 2.0: Conflict Boogaloo
 2016-02-21 11:30:34 -05:00
Hubblenaut
60f5358751 All cash now acts like bundles 2016-02-21 17:23:54 +01:00
PsiOmegaDelta
36c99aecae Closet breakout no longer failes early. 
Caused by req_breakout() always making us quit early if we're already breaking out.
Breakout sound/animation now play after the checks.
Fixes the secure locker break_open() override, which wouldn't update the welded flag and thus keep you imprisoned.
Fixes a couple of bad macros.
 2016-02-21 13:57:03 +00:00
PsiOmegaDelta
afdafb3862 Makes the into-resist proc solely responsible for checking click delays. 
Because it sets the click cooldown itself downstream procs fail when they in turn check the click delay.
Fixes #11839. Fixes #12062. Fixes #12114.
 2016-02-21 12:45:01 +00:00
sabess
71d8acc2cb Fixed the damage again, oops. 2016-02-21 23:06:05 +11:00
sabess
cb1e26ec70 Fixed conflicts with another thing. 2016-02-21 22:48:56 +11:00
Neerti
93dd32f1b2 Merge pull request #1037 from Yoshax/dolladolla 
Changes predefined space cash stacks to be bundles
 2016-02-21 04:48:00 -05:00
Zuhayr
ebd2360f43 Merge pull request #1004 from Kelenius/master 
Monkey cubes now expand in showers
 2016-02-21 17:49:46 +10:30
Zuhayr
560e6a0ffc Merge pull request #992 from Neerti/2/14/2016_ling_nerfs_and_ear_protection_cleanup 
Ling nerfs, ear protection cleanup, and ling bugfixes.
 2016-02-21 17:48:44 +10:30
Yoshax
76db1f5e6c Changes predefined space cash stacks to be bundles 
Fixes #926
 2016-02-21 02:16:14 +00:00
Mark9013100
8b84695598 Z1/2 Fixes & Edits 2016-02-20 17:55:05 -05:00
Yoshax
23c3c58f25 Removes inappropriate message 2016-02-20 21:31:13 +00:00
Crazylemon64
6e261771db Allows lighting of smokeables on burning people 2016-02-20 20:54:27 +00:00
Matt
c07dfe5372 Unlimited Welder Fix 
Fixes a bug where welders are infinite use.  With this, the Welder will not turn on unless it has at least 1u of welder fuel.  Previously, it worked on 'not zero', which allowed it to weld endlessly with fractions of 1u inside (as it was not Zero, but could not deduct 1 from it when used).
 2016-02-20 06:33:45 -05:00
Yoshax
46f2528481 Adds linoleum stack 2016-02-20 04:10:41 +00:00
Kelenius
a5e4aa33d5 Monkey cubes now expand in showers 
Port of https://github.com/Baystation12/Baystation12/pull/12107 and
https://github.com/Baystation12/Baystation12/pull/12183
 2016-02-18 12:24:38 +03:00
Datraen
129965b1c4 Adds a variable to check for grenade loading, makes frags unloadable. 2016-02-16 12:58:17 -05:00
Neerti
b7a3a98ef0 Ling nerfs, ear protection cleanup, and ling bugfixes. 2016-02-14 19:58:57 -05:00
Mark9013100
cab884b5dc Implements sprites for shotgun shell boxes. 2016-02-12 20:30:43 -05:00
Zuhayr
82faa30992 Merge pull request #961 from Mark9013100/2/10/2016jackets 
Adds the IA jacket/fake sunglasses to custom loadout
 2016-02-12 10:06:21 +10:30
Neerti
9493290997 Merge pull request #933 from Zuhayr/tesharifixes 
Small mob reagent changes.
 2016-02-11 17:18:07 -05:00
Mark9013100
7d3b5a09b7 Adds the IA jacket/fake sunglasses to custom loadout 2016-02-10 14:16:50 -05:00
Mark9013100
63db2c8f0b Portable Freezers can no longer be folded 2016-02-10 05:43:09 -05:00
EmperorJon
c430f065b4 Merge pull request #938 from Neerti/2/8/2016_stasis_bag_cleanup_and_buffs 
Makes stasis bags better
 2016-02-09 16:05:08 +00:00
Neerti
ecebb49ad1 Makes stasis bags better. 2016-02-08 17:19:38 -05:00
Kelenius
f106b3f26b Removes cloaking device 
Adminspawn-only device that is never used, but every time a human
updates icons, they check if they have one. Neat!
 2016-02-08 14:28:54 +03:00
Zuhayr
4820420182 Added several mobsize and Teshari checks to reagent processing. 2016-02-08 20:21:04 +10:30
Zuhayr
86fdd0c86b Fixes for previous. 2016-02-08 19:57:15 +10:30
Neerti
5a48bbc7c7 Merge pull request #924 from Zuhayr/master 
Allowed pouring reagent containers down the sink.
 2016-02-08 02:35:38 -05:00
Zuhayr
2e83dfba51 Added blood volume and hunger variables for species. 2016-02-08 13:13:35 +10:30
Zuhayr
dad8d16136 Allowed pouring reagent containers down the sink. 2016-02-07 21:49:23 +10:30
Zuhayr
3239ed23b5 Numerous small Teshari fixes. 2016-02-07 17:16:59 +10:30
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Neerti
f2cd67fe16 Merge pull request #810 from Zuhayr/bayupdate 
Bay update.
 2016-02-05 23:21:07 -05:00
Mark9013100
4782794909 Increases the list of items belts can hold 2016-02-05 23:13:40 -05:00
Zuhayr
115eb19d33 Merge branch 'bayupdate' of https://github.com/Zuhayr/Polaris into bayupdate 2016-02-06 14:30:51 +10:30
EmperorJon
c29c97dcce Merge pull request #905 from Zuhayr/resomi 
Seromi rename.
 2016-02-06 02:24:45 +00:00
Zuhayr
19014807fd Surface rename of Seromi to Teshari. 2016-02-06 12:50:16 +10:30
Datraen
4c0bd923c3 Merge pull request #866 from Kelenius/viroRemoval 
Removes the old virus system
 2016-02-05 21:06:09 -05:00
Kelenius
906b03e736 Gives AI the hud, sorts the verbs 
Removes 'AI IM' category
Adds 'AI settings' category
Unnecessary verbs are hidden by default but can be shown/hidden again by
using a verb
 2016-02-05 17:21:04 +03:00