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,954 Commits 10 Branches 0 Tags
075343c62ddfa26d938670711097c57df84c2e91
Commit Graph

21638 Commits

Author SHA1 Message Date
Datraen
075343c62d Gives implants show_messages access. 2016-01-13 12:48:09 -05:00
Zuhayr
004687abaa Merge pull request #708 from Hubblenaut/coffee 
Coffee Shop
 2016-01-13 23:34:10 +10:30
Zuhayr
98352cf09c Merge pull request #767 from EmperorJon/12_Jan._Mask_coverage_fixes 
Fixes mask coverage
 2016-01-13 23:23:34 +10:30
Hubblenaut
42b7acea8b Merge remote-tracking branch 'upstream/master' into coffee 2016-01-13 02:19:22 +01:00
Hubblenaut
721728d3dd Adds porcelaine cups 2016-01-12 19:42:43 +01:00
Jon
9a303ea576 Fixes mask coverage. 2016-01-12 18:21:29 +00:00
Neerti
91e7700999 Merge pull request #759 from GinjaNinja32/pl-cable 
Fix Baystation12/Baystation12#11955, fix #479
 2016-01-12 01:17:58 -07:00
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
1702765073 Hackfix for impossible-to-remove cuffs. 2016-01-12 16:27:15 +10:30
Zuhayr
40b7c087c9 Attempting to fix perma-wet-floors bugs. 2016-01-12 15:50:20 +10:30
Zuhayr
0c2ec6422a Merge pull request #727 from Mark9013100/1/3/2016edits 
Edits/Changes, 1/3/2016
 2016-01-12 04:31:38 +10:30
Zuhayr
5464e3fedd Merge pull request #750 from GinjaNinja32/pl-world-topic 
world Topic changes from Bay
 2016-01-12 04:30:38 +10:30
Zuhayr
34b139b714 Merge pull request #761 from EmperorJon/11_Dec._Adds_Ward_Takahashi_prosthetics 
Add's Ragnie's Ward-Takahashi prosthetics to the game.
 2016-01-12 04:26:56 +10:30
Jon
a28f08e6c2 Add's Ragnie's Ward-Takahashi prosthetics to the game. 
This should be all that's needed, I think?
 2016-01-11 17:51:50 +00:00
GinjaNinja32
12a38a3610 Fix #11955 2016-01-10 22:26:47 +00:00
GinjaNinja32
5008120f11 add revision topic call 2016-01-09 18:12:13 +00:00
GinjaNinja32
fa115aaaae info topic improvements 2016-01-09 18:12:05 +00:00
Mark9013100
1bf73936cd Removes the maintenance access I added to Medical Doctors. 2016-01-08 23:16:59 -05: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
Datraen
ee8b26b942 Gives telecrystals tech levels, restores PDA default to new PDA. 2016-01-08 18:06:45 -05:00
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
Mark9013100
91f191e800 Edits/Changes, 1/3/2016 2016-01-03 20:21:34 -05: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