cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,697 Commits 8 Branches 0 Tags
a7529a87d28eece021aa60954493e67de7b0a050
Commit Graph

13077 Commits

Author SHA1 Message Date
Neerti
ec14777e29 Merge pull request #579 from Hubblenaut/master 
Tweaks Filtering and Toxic Gases
 2015-12-15 16:14:53 -05:00
Hubblenaut
bb55eb7368 Fixes vaccum pockets on new floors 2015-12-15 15:48:00 +01:00
Hubblenaut
58cb56492e Tweaks Filtering and Toxic Gases 2015-12-15 13:57:52 +01:00
Mark9013100
edd53b813c Corrections to custom loadout 2015-12-14 19:18:56 -05:00
Mark9013100
172ef26cc9 Adds festive santa hats! 2015-12-14 18:32:00 -05:00
Neerti
e9e163f5ed Merge pull request #569 from Neerti/12/14/2015_communicators_v2 
Communicators: Reloaded: Revenge of the NanoUI
 2015-12-14 17:32:09 -05:00
SinTwo
52095fb4d5 Merge pull request #568 from EmperorJon/14_Dec._Fix_flavour_text 
Fixes flavour text
 2015-12-14 17:28:32 -05:00
Neerti
8d3cc68771 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/14/2015_communicators_v2 2015-12-14 15:44:38 -05:00
Neerti
3e5436c4b7 Upgrades communicators to NanoUI, adds a new EPv2 fake networking system, adds new semi-telecomms machine, lets communicators call ghosts, call other communicators, and have as many ghosts or communicators linked as the user desires. Adds preference option to remain invisible on communicator device searches. 2015-12-14 15:43:53 -05:00
Jon
14bc2afe43 Removes errant debug line. 2015-12-14 20:22:18 +00:00
Jon
af802266e4 Removes the else to properly for the switch statement, meaning that it no longer wipes your flavour text/thinks you're opening the general slot ever time. 2015-12-14 20:20:35 +00:00
Neerti
e3bf3483c8 Merge pull request #559 from Yoshax/master 
Adjusts the death-whiskey
 2015-12-13 21:28:09 -05:00
Neerti
24e2daa663 Merge pull request #560 from Woodratt/1.3.2_Minor_fixesnadditions 
-1.3.2-
 2015-12-13 21:27:52 -05:00
Neerti
2aaa4e9a5e Merge pull request #525 from Zuhayr/qol 
Porting various QOL from Bay.
 2015-12-13 21:25:43 -05:00
woodratt
cbb8a93451 -1.3.2- 
- Fixed stripe on xenoarch outpost
- Added in a airlock for toxins to go to the toxins test site.
- Underwear closet added to visitor's laundry.
- Bar code scanner added to the library office.
- Added in missing window pane on detective's office.
- Added in chapel office shutters.
- Fixed leather jacket alt
- White Stockings added.
 2015-12-13 17:36:20 -08:00
Yoshax
1eb91b3144 Adjusts the death-whiskey 2015-12-13 22:46:42 +00:00
Neerti
0c8038f893 Merge pull request #550 from Yoshax/master 
Makes the mythical special blend whiskey real
 2015-12-12 23:20:35 -05:00
Neerti
55432f7be6 Merge pull request #548 from EmperorJon/13_Dec._Headphones 
HEADPHONES.
 2015-12-12 23:20:00 -05:00
Yoshax
48dcb85b44 Makes the mythical special blend whiskey real 2015-12-13 03:31:36 +00:00
Jon
6bc3390841 HEADPHONES. 
DO THEY WORK PROPERLY NOW? OF COURSE!

Okay, now that's all sorted, Zuhayr's sprites, so kudos.
They cost 1 point in the loadout menu. Work just like earmuffs with added verb functionality to toggle cool animation. That's all.
 2015-12-13 01:37:34 +00:00
Neerti
64a5290711 Adds set_tcrystals() to hidden adminverb list. 
As requested by Datraen.
 2015-12-12 19:38:41 -05:00
Mark9013100
52d361af72 Fixes evidence bags 2015-12-12 19:10:21 -05:00
Neerti
aa2285cfb5 Fixes admin check in new set_telecrystal proc. 2015-12-12 10:56:06 -05:00
EmperorJon
f7e5c7cd50 Merge pull request #542 from Woodratt/1.3.0_grenades_elevators 
1.3.0 of Grenades and Elevators
 2015-12-12 15:37:04 +00:00
woodratt
a22195aed3 1.3.0 of Grenades and Elevators 
- Explosive grenades have gotten a major upgrade, (borrowed code from fragmentation grenades).
- Box for explosive grenades lowered to 5 grenades per box instead of 7.
- Evidence locker moved to forensics area from detective's office. Body bags, latex gloves, and evidence bags moved to said locker.
- Low yield EMP grenades created including sprites. Box for them created (neither added to the map).
- Can now spawn from the elevator.
 2015-12-11 23:05:15 -08:00
Datraen
ef0337fccf Refactors Telecrystals into individual pools, adds a new command to allow for admins to modify telecrystal levels. 2015-12-11 21:14:11 -05:00
EmperorJon
07d1e6bbaf Merge pull request #531 from EmperorJon/11_Dec._IRC_related_changes 
Makes changes to allow IRC bot output
 2015-12-11 20:09:06 +00:00
Jon
238292a9a6 Makes changes to allow IRC bot output at Sparky's request. 2015-12-11 19:58:05 +00:00
woodratt
3d750f1ff6 1.2.9. 
- Added missing shutters to certain areas.
- Military Jacket variant added (different patches)
- Added different colored jumpsuits to the loadout
- Fixed some voided tiles on the telecomm outpost
- Added missing equipment to the forensics area
- Edited the crew transfer wording to be more lore friendly
 2015-12-10 22:12:07 -08:00
Zuhayr
7a8d88f5a9 Tweaks to the previous commits. 2015-12-11 15:55:31 +10:30
Zuhayr
1ea7aebb62 Added boot knives and putting a knife in your boot. 2015-12-11 15:55:23 +10:30
Zuhayr
5589050767 Comments out the starving/overfed examine lines. 2015-12-11 15:55:05 +10:30
Zuhayr
793bc18efd Mops can now be wet in buckets or sinks. 2015-12-11 15:54:56 +10:30
Zuhayr
d2399e5f66 Drones now get a jetpack and extinguishers. 2015-12-11 15:54:47 +10:30
Zuhayr
1a42e14833 You can now pull your punches when engaging in unarmed combat. 2015-12-11 15:54:37 +10:30
Zuhayr
14b124a97e Duct tape can now be used to gag, blindfold or cuff people, and cable cuffs/duct tape can restrain rig-wearing people (poorly). 2015-12-11 15:54:04 +10:30
Zuhayr
2edf2c499f POCKET SAND! 2015-12-11 15:53:40 +10:30
Zuhayr
5bf4d2599b Renamed silicates to sand. 2015-12-11 15:53:23 +10:30
Zuhayr
d2e092c899 Diona nymphs and fruit are now able to be holstered. 2015-12-11 15:52:22 +10:30
Zuhayr
07874b9ca8 Holsters will now show as 'occupied' on examine if something is in them. 2015-12-11 15:52:05 +10:30
Neerti
5dbbbaa80b Merge pull request #456 from Zuhayr/master 
Porting forensics from Aurora.
 2015-12-10 19:50:44 -05:00
zaredman
84832f8a9d Merge pull request #515 from EmperorJon/10_Dec._Removes_grimderp_AI_news_event 
Changes the description for the AI SYSTEMATICALLY KILLING CIVILIANS GRIMDEERRRRP news event
 2015-12-10 17:11:45 -05:00
Jon
5d3e3cf863 Removes the AI SYSTEMATICALLY KILLING CIVILIANS GRIMDEERRRRP news event. Replaces the message with one saying it simply caused damage. 2015-12-10 21:35:35 +00:00
Neerti
a9e7783bcb Merge pull request #511 from Woodratt/1.2.7_map_fixes2 
1.2.7 Map Fixes and sprite additions
 2015-12-10 13:50:01 -05:00
Neerti
a25c728c07 Merge pull request #509 from Hubblenaut/master 
Fixes onmob icons for holders
 2015-12-10 13:40:31 -05:00
woodratt
be97cbaf48 1.2.7 Map Fixes and sprite additions 
- Soda fountains added to heist base and merc base. Flamethrowers removed.
- Reduced the amount dufflebags can carry to 12 slots
- Additional shuttles added to captain's office, bridge hallway, hop office, engineering engine area, chapel, security restroom.
- Double disposal pipes and atmos pipes removed from several areas.
- Tweaked engineering restroom
- Two communicators added to the map, hotel area and civilian lockeroom.
- Groundwork added for head of staff folders added.
 2015-12-10 10:35:38 -08:00
Hubblenaut
9980b7ef13 Fixes onmob icons for holders 2015-12-10 19:17:13 +01:00
Neerti
ef5c20f9b3 Merge pull request #506 from Hubblenaut/master 
Fixes Cable Merging and Floor Placing
 2015-12-10 12:45:02 -05:00
Neerti
9d4d8e3998 Merge pull request #508 from Hubblenaut/flavor 
Tiny Fixes
 2015-12-10 12:44:43 -05:00
Hubblenaut
95a190ae30 Fixes empty flavor text drawing two spaces 2015-12-10 18:07:00 +01:00