cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,920 Commits 10 Branches 0 Tags
12a38a3610d0692be21348bd9f1c83fc76ecda47
Commit Graph

21617 Commits

Author SHA1 Message Date
GinjaNinja32
12a38a3610 Fix #11955 2016-01-10 22:26:47 +00:00
Datraen
e77a06e176 Merge pull request #748 from Zuhayr/prosthetics 
Blindness fix.
 2016-01-08 23:09:03 -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
EmperorJon
14e060f1a6 Merge pull request #743 from Zuhayr/showfix 
Several fix ports, minor show_messages inclusion.
 2016-01-09 02:05:58 +00:00
Zuhayr
8416cd976f More thorough fix for FBP immortality. 2016-01-09 12:11:12 +10:30
Zuhayr
1579f4c724 Removing a world that snuck back in after rebase. 2016-01-08 23:20:53 +10:30
Zuhayr
f045c62821 Rewriting some pull logic. 2016-01-08 23:20:40 +10:30
Zuhayr
baf1e4315e Generalized pulling restrictions to mob level. 2016-01-08 23:20:30 +10:30
Zuhayr
4ab3daf318 Generalized w_class to obj level, defaulting to null. 2016-01-08 23:19:23 +10:30
Zuhayr
b174b68e0a Holders now pass on their contained mob's ID card. 2016-01-08 23:18:42 +10:30
Zuhayr
80e4235c68 Unifying mob scooping, removing some unneeded boilerplate. 2016-01-08 22:17:05 +10:30
Zuhayr
763a4b88e7 Allows held mobs to see messages. 2016-01-08 21:40:02 +10:30
Datraen
90b1e14841 Fixes #685. 2016-01-07 21:30:33 -05:00
Datraen
2494df8b1d Merge pull request #731 from Zuhayr/ipcscreen 
Display monitors and manufacturer fixes.
 2016-01-07 12:34:03 -05:00
Zuhayr
a5227c9904 Merge pull request #698 from Hubblenaut/master 
Changes to Confused Moving
 2016-01-08 00:52:35 +10:30
Zuhayr
99941146f5 Merge pull request #729 from Hubblenaut/wheelchair 
Wheelchair fixes
 2016-01-08 00:51:39 +10:30
Zuhayr
8d8260107b Merge pull request #734 from Datraen/ExtendedDescAdds 
Adds extended info to certain game modes missing extended info.
 2016-01-08 00:50:28 +10:30
Dibasic
4573b22922 Cold air shiver typo fix 2016-01-06 00:37:10 -06:00
Datraen
9b3c21cb05 Adds extended info to certain game modes missing extended info. 2016-01-05 21:12:35 -05:00
EmperorJon
8520acb8a5 Merge pull request #732 from Datraen/AOOCTweak 
AOOC Access Tweak + a little extra
 2016-01-06 00:21:51 +00:00
Datraen
0c4c3b7add Gives mods AOOC, fixes AUTOAUTOTRAITOR. 2016-01-05 18:12:56 -05:00
EmperorJon
6cc010f662 Merge pull request #730 from Woodratt/1.4.1_paramedic_tweaks 
1.4.1 Minor Medical Tweaks
 2016-01-05 17:01:02 +00:00
Zuhayr
fb1c3c10b7 Should fix some issues with prosthesis customisation for FBPs. 2016-01-05 16:32:38 +10:30
Zuhayr
51deb6cd7e Made old IPC icons into a mask slot item for prosthetic heads. 2016-01-05 16:20:42 +10:30
woodratt
bd71920178 1.4.0 Minor Medical Tweaks 
- Fixed the HUD icon for paramedics (Also for the ERT)
- Paramedics now have access to the morgue.
- Chemists and Psychiatrists now have access to the medical skirt in the load out.
 2016-01-04 16:53:28 -08:00
Hubblenaut
61e31ab8ad Wheelchair fixes 2016-01-05 00:56:57 +01:00
Loganbacca
3108ed3411 Adds Barista alt role to Bartender 
Also increases slots to 2
 2016-01-04 13:50:13 +13:00
Neerti
beb54f906a Merge pull request #724 from Datraen/Telecrystal-Item 
Telecrystal item implementation + More
 2016-01-03 13:57:11 -05:00
Neerti
923cccef92 Merge pull request #725 from EmperorJon/03_Jan._Fix_player_panel_new 
Fixes search functionality of player-panel-new
 2016-01-03 12:32:10 -05:00
Jon
a1b187b8b0 Fixes search functionality of player-panel-new. 2016-01-03 17:27:11 +00: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
f539637cd2 Merge pull request #723 from Datraen/ModDN 
Gives staff more accesses.
 2016-01-03 19:25:32 +10:30
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
Datraen
c19d735e7b Adds more accesses to things. 2016-01-02 22:19:44 -05:00
Datraen
f3a60c054c Gives mods access to direct narrate. 2016-01-02 21:25:09 -05:00
Datraen
830a60511c Merge pull request #719 from PolarisSS13/1/2/2016_intercom_fix 
Fixes intercom bug
 2016-01-02 20:45:51 -05:00
Datraen
8f2d678b77 Merge pull request #722 from EmperorJon/03_Jan._Fix_blood_injection 
Fixes #696 (IVs/Blood injection going to wrong place)
 2016-01-02 20:39:37 -05:00
Jon
b918d7f676 Blood was going into the bloodstream reagents of the mob, not actually vessel bloodstream as it were. A check was in place that mobs which required a heart did this, whereas the actual check should have been mobs that didn't require a heart. In other words, if you're some sort of species that doesn't have a heart, having blood put into you should put it in however you explain the "bloodstream" reagent container as opposed to actually increasing the mob's blood count. 2016-01-03 00:43:35 +00: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
Neerti
bced22d41a Merge pull request #712 from Zuhayr/polfix 
Fixes holopad messaging.
 2015-12-31 21:57:52 -05:00
Zuhayr
5c1e87b131 Fixes holopad messaging. 2016-01-01 13:21:41 +10:30
Neerti
fd3b91650f Merge pull request #711 from Zuhayr/polfix 
May fix massive lag issues with autofire guns.
 2015-12-31 21:12:12 -05:00
Zuhayr
3044496ae9 Attempting to limit object checks. 2016-01-01 12:25:30 +10:30