cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-28 10:12:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,429 Commits 8 Branches 0 Tags
ecebb49ad12b842dc1d9ad9727dbb2381fefccee
Commit Graph

3242 Commits

Author SHA1 Message Date
Neerti
ecebb49ad1 Makes stasis bags better. 2016-02-08 17:19:38 -05:00
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
Zuhayr
408cb5d8d8 Adds a coverage check to xenoflora splattering, adjusts brainloss across 
the board.
 2016-01-31 11:49:14 +10:30
Zuhayr
f31438bd77 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate 2016-01-30 08:49:35 +10:30
Zuhayr
43176f6640 Merge pull request #867 from Kelenius/grenadeFix 
Fixes #847
 2016-01-28 21:28:30 +10:30
Zuhayr
ad64a7941b Merge pull request #863 from Mark9013100/1/26/2016badgesmedals 
Adds more security badges/medals
 2016-01-28 21:26:56 +10:30
Mark9013100
51a9cef15f Adds more security badges/medals 2016-01-28 00:33:49 -05:00
Kelenius
7ad3cea9ad Fixes #847 2016-01-27 12:07:35 +03:00
Kelenius
b86c730695 Removes the old virus system 
Appendicitis moved to appendix organ
 2016-01-27 11:44:41 +03:00
Zuhayr
58736fb4f6 Renaming Resomi to Seromi. 2016-01-27 14:24:09 +10:30
Zuhayr
eef9145486 Revert "Removes Resomi." 
This reverts commit c9f579e00a.
 2016-01-27 13:48:48 +10:30
Zuhayr
d5b904ca2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-26 11:11:55 +10:30
Kearel
5727971690 Semi ports Baystation12/Baystation12#11445 2016-01-25 20:35:52 +00:00
Datraen
dcf2e5cb6b Fixes the hang up button. 2016-01-24 23:12:53 -05:00
Zuhayr
ab9574ee06 Fixing some infinite loops in gun update_icon() calls. 2016-01-22 04:27:00 +10:30
Zuhayr
36c0bb0f13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-22 01:33:09 +10:30
Zuhayr
0a2cf6ad46 Converted two-handed weapons to use the same wielding mechanic as guns. 2016-01-21 01:40:40 +10:30
Zuhayr
f89948d666 Added functionality for two-handed gun use. 2016-01-21 00:51:54 +10:30
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Neerti
02b8599123 Merge pull request #739 from Datraen/Trayfix 
Allows trays to drop their items, adds color to material items on trays
 2016-01-15 22:40:54 -05:00
Datraen
460075b360 Slight optimization in dropped, adds colors to material items. 2016-01-14 18:29:49 -05:00
Datraen
daeba35c6d Merge pull request #778 from Zuhayr/polaris 
Fixes.
 2016-01-13 14:18:24 -05:00
Datraen
075343c62d Gives implants show_messages access. 2016-01-13 12:48:09 -05:00
Zuhayr
d0717791dc Fixes #270 2016-01-14 00:33:31 +10:30
Neerti
cbdff5d241 Merge pull request #746 from Datraen/TeleCrystal-Item2 
Gives telecrystals tech levels, restores PDA default to new PDA.
 2016-01-12 01:17:17 -07:00
Zuhayr
0c2ec6422a Merge pull request #727 from Mark9013100/1/3/2016edits 
Edits/Changes, 1/3/2016
 2016-01-12 04:31:38 +10:30
Mark9013100
1bf73936cd Removes the maintenance access I added to Medical Doctors. 2016-01-08 23:16:59 -05:00
Zuhayr
905cb5943d Readds blindness removal to imida 
zoline and organ surgery. Stops imidazoline healing robotic eyes.
 2016-01-09 13:24:46 +10:30
Datraen
ee8b26b942 Gives telecrystals tech levels, restores PDA default to new PDA. 2016-01-08 18:06:45 -05:00
Datraen
5699306cf3 Trays now drop items properly 2016-01-07 20:31:05 -05:00
PsiOmegaDelta
39bbca416a Adds missing istype() check before the secure brief case emag check. 
Fixes #11900.
 2016-01-06 18:31:39 +01:00
Neerti
beb54f906a Merge pull request #724 from Datraen/Telecrystal-Item 
Telecrystal item implementation + More
 2016-01-03 13:57:11 -05:00
Datraen
9c89f9db1b Drops telecrystal from inventory prior to qdel for icon updating purposes. 2016-01-03 04:04:16 -05:00
Datraen
c11e2c5de7 Generic name of telecrystals to lower case. 2016-01-03 03:58:49 -05:00
Zuhayr
bda43c7457 Merge pull request #713 from Woodratt/1.4.0_Extinguisher_fix 
1.4.0 Fire extinguishe fixes and tweaks
 2016-01-03 19:20:56 +10:30
Datraen
6df5225059 Adds comments, changelog. 2016-01-03 01:27:44 -05:00
Datraen
37e1913fda Creates telecrystal item for exchanging telecrystals between antags. 2016-01-03 01:22:48 -05:00
Datraen
8e70e4e91a Merge pull request #709 from SinTwo/New_PDA_Sprites 
New PDA Sprites
 2016-01-02 23:29:36 -05:00
Neerti
110593be86 Fixes intercom bug 
Fixes #718
 2016-01-02 14:03:06 -05:00
PsiOmegaDelta
2e89b7c718 Fixes the canUnEquip() proc. 
It now only checks state, it doesn't change it. Fixes a number pf odd item/bag interactions.
 2016-01-02 16:59:16 +01:00
Zuhayr
447d0e74ce Added a colour selector to the floor painter, added the floor painter to the construction and drone modules. 2016-01-02 07:05:45 +10:30
woodratt
300cafd987 1.4.0 Fire extinguishe fixes and tweaks 
- Tweaks the amount that fire extinguisher holds and particles they send out. According to Spookerton there's no advantage to having more than 3 particles. In tests this seems to be the case as well.
- Also a minor edit to the code for patting people out that are on fire (as suggested by Spookerton), should help with folks that get set on fire.
- Added more fire extinguishers through medical.

-- One note -- Found in testing the fire extinguishers, water on tiles does not go away over time. Fire extinguishers appear to spray water on the tiles. Didn't know a way around this or how to fix this.
 2015-12-31 20:57:18 -08:00