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
30,308 Commits 10 Branches 0 Tags
b6a602ba9a8dc20fa82ebee34cbea048a25ab9c2
Commit Graph

13859 Commits

Author SHA1 Message Date
EmperorJon
b429c7b7e8 Merge pull request #1345 from Neerti/4/3/2016_fixes_cloaks_and_guns 
Firing a gun while cloaked will now unclock you.
 2016-04-03 23:34:11 +01:00
Neerti
151082343b Firing a gun while cloaked will now unclock you. 2016-04-03 18:20:07 -04:00
EmperorJon
bdede3c3fd Merge pull request #1341 from Yoshax/lunchboxes 
Adds lunchboxes
 2016-04-03 20:25:19 +01:00
Yoshax
36c1746f37 Adjusts lunchbox loadout cost 2016-04-03 20:21:19 +01:00
Yoshax
a7e5116598 Adds lunchboxes 2016-04-03 17:12:01 +01:00
EmperorJon
a118265a4b Merge pull request #1340 from Datraen/PreferenceVerbsPerms 
Toggles now save preferences when toggled.
 2016-04-03 16:30:07 +01:00
Datraen
a2c4395bad Toggles now save preferences when toggled. 2016-04-03 09:15:01 -04:00
woodratt
1f3556316d 1.4.9 Hotfix 
- Phoron tank in atmos brought back into OSHA non-compliance
- Extra table in the starboard aid station removed.
- Missing air alarms in visitor rooms added.
- Derelict shop area updated.
- Manhack grenade fixed for heist.
- Two of the three spike throwers removed.
- Three new "hair" styles added for Teshari, fixed one broken one.
- Toxins mixing chamber now starts airless.
- Framework in place to allow for a custom item (white cane)
- Fixed access restrictions on riot control maintenance door.
- Firelock added to CE's office door. Entryway from the CE's office to the monitoring room added.
- Fixed a camera in the detective's office.
- Anchored the exonet node on T-comms.
- Fixed Dufflebag in hand sprites.
 2016-04-02 15:44:37 -07:00
Datraen
2e0fdafc37 Changes mob names of admins that stealth while in lobby. 2016-04-01 16:57:24 -04:00
Datraen
459f70ba46 Merge pull request #1319 from Mark9013100/3/31/2016medweb 
Adds the medical webbing
 2016-04-01 16:53:58 -04:00
Neerti
983192bf11 Merge pull request #1315 from Datraen/PrefVerbsPerms 
Updates Preference Permissions, Re-adds Verbs
 2016-04-01 16:53:52 -04:00
EmperorJon
7930557e01 Merge pull request #1314 from Neerti/3/31/2016_research_borg_fix 
Fixes Research Module's Analyzer
 2016-04-01 19:09:38 +01:00
Mark9013100
f51a350281 Adds the medical webbing 2016-04-01 08:11:23 -04:00
Atlantis
b239cf4b19 Adds synthetics to the crew manifest 
- Synthetics now show on the crew manifest properly. This might as well be a bug fix since they already had the category, it just didn't work at all, since they don't have official security/medical/employment records.
- This does not mean synthetics are part of crew. They just show on the crew manifest for the sake of knowing who is in game when you are joining. I often saw people join a specific position, only to see that all work has already been done by a cyborg.
- As a note, Syndicate/Combat module cyborgs don't show on the manifest. Emagged cyborgs do show, however.
- This does not (probably) support the PDA manifest (which is currently broken anyway)
- Example screenshot: http://i.imgur.com/RSPuuom.png

🆑
rscadd: Cyborgs and the AI now show on the crew manifest.
:/cl:
 2016-03-31 17:25:28 -04:00
Datraen
91a6c51ed2 Adds toggle verbs and procs. 2016-03-31 16:42:13 -04:00
Neerti
453249d7a0 Merge pull request #1302 from Yoshax/newloadoutcolors 
Now possible to tweak colors of loadout items.
 2016-03-31 16:33:38 -04:00
PsiOmegaDelta
f7bd00521b Preference logic tweaks. 
Reduces copy-paste. Adds the ability to easily toggle settings.
No functional changes otherwise.
 2016-03-31 16:31:24 -04:00
Datraen
41996815ae Gives categorization to the preferences as per the current staff structure. 2016-03-31 16:30:13 -04:00
Neerti
6d7b4bfd9f Corrects issue in cherrypicking. 2016-03-31 16:29:48 -04:00
Daranz
9837c098eb Further CallTechName() tweak 2016-03-31 16:11:42 -04:00
Daranz
baf49d0c23 Tweak CallTechName() 2016-03-31 16:11:13 -04:00
Daranz
2482ddf55a Resolve problem with robot destructive analyzer 
CallTechName() was borrowed from destructive_analyzer.dm for reuse in
the portable analyzer.

Resolves #12356
 2016-03-31 16:10:07 -04:00
Kelenius
6d76aa3966 Fixes #945 - monkeys can't ventcrawl 
Ventcrawl will now tell you which items prevent you from crawling if it
fails due to that
 2016-03-31 18:12:30 +03:00
Neerti
c06415c436 Merge pull request #1299 from EmperorJon/30_Mar._NanoMap_Stuff 
Updates NanoUI map.
 2016-03-30 14:24:09 -04:00
Hubblenaut
3a45ceee64 Full fertilizer bottles of type glass/bottle 2016-03-30 19:42:13 +02:00
PsiOmegaDelta
b277447426 Now possible to tweak colors of loadout items. 
Used to greatly cut down on the number of hats (hijabs, kippots, and turbans).
 2016-03-30 18:01:09 +01:00
PsiOmegaDelta
877e3d66df Makes loadout datums more flexible. 
Loadout item definitions can now also take a list of tweaks, which will adjust the item after spawn.
Currently includes color and icon state changes.
 2016-03-30 16:46:14 +01:00
EmperorJon
5e05d6b91a Merge pull request #1293 from Yoshax/progressbars 
Adds progress bars to tasks that take time
 2016-03-30 15:15:00 +01:00
EmperorJon
2bb4f43166 Merge pull request #1237 from Hubblenaut/grabpull 
Removes people being able to pull from somebody's grab
 2016-03-30 15:07:25 +01:00
Jon
3c85fe3e65 Updates NanoUI map. 
Also should update the necessary files so you don't need to alter nanomapgen.dm to fit our map.
I don't know why I didn't just commit this the first time. Call me dumb.
 2016-03-30 15:02:42 +01:00
Neerti
75c0c5cc38 Changes lots of gun stuff, see PR for details. 2016-03-30 03:41:54 -04:00
Neerti
015c6ef58a Merge pull request #1284 from Mark9013100/3/29/2016mapfixes 
Map fixes, minor edits
 2016-03-30 02:25:35 -04:00
Neerti
e7c9681c91 Merge pull request #1281 from redstryker/Navy-Blue-Scrubs 
Adds Navy Blue scrubs
 2016-03-30 02:24:07 -04:00
Neerti
a9b2e7a61e Merge pull request #1133 from Kelenius/coolBots 
Overhauls bot AI
 2016-03-30 02:23:28 -04:00
Yoshax
9b7b8656ba Merge remote-tracking branch 'upstream/master' into progressbars 2016-03-30 00:31:03 +01:00
Yoshax
5b225ba765 Fixes subtype 2016-03-30 00:28:38 +01:00
PsiOmegaDelta
84799befca Can now toggle the progress bar visibility. 
Enabled  by default.
 2016-03-30 00:13:41 +01:00
EmperorJon
547b4994da Merge pull request #1292 from Yoshax/saltfix 
Fixes Deadchat
 2016-03-30 00:03:41 +01:00
Yoshax
c1e69fd8a3 Adds a missing ! 2016-03-29 23:55:27 +01:00
EmperorJon
b513e4be92 Merge pull request #1288 from Mark9013100/3/29/2016riothelmedit 
Minor change to riot helm code
 2016-03-29 23:53:33 +01:00
Datraen
3809e92adf Merge pull request #1214 from Yoshax/morepreferences 
Makes it possible to have more than 16 preferences
 2016-03-29 14:44:47 -04:00
Mark9013100
a7b6bf1960 Minor improvement to riot helm code 2016-03-29 12:43:07 -04:00
Mark9013100
50a6f53c12 Map fixes, minor edits 2016-03-29 10:50:22 -04:00
Kelenius
c8b510b415 Adds unit tests 
Port of https://github.com/Baystation12/Baystation12/pull/11808 and
several others
Fixes three overlapping cables ([192 / 158 / 1], [214 / 161 / 1], [122 /
197 / 1])
Fixes drill and mech drill having the same ID.
 2016-03-29 17:42:22 +03:00
Datraen
f2e9601400 Fixes a check to blind if there is a lack of eyes. Broken eyes are already handled in their process. 2016-03-29 00:36:38 -04:00
redstryker
7a437e12f5 Adds Navy Blue scrubs and a navy blue surgical cap. Also adds them to the loadout and all appropriate lockers. 2016-03-28 23:53:38 -04:00
Neerti
8bfac9c57a Merge pull request #1206 from Hubblenaut/master 
Adds wallets to loadout menu
 2016-03-28 12:49:57 -04:00
Yoshax
db1a5021bc Corrects error in a span ckass 2016-03-28 17:19:03 +01:00
Mark9013100
f95cbbdc4a Ports /tg/'s armored trenchcoat sprite 2016-03-27 07:06:01 -04:00
Neerti
ddf4cceb96 Merge pull request #1260 from Datraen/BuckleResistFix 
Fixes buckling preventing NanoUI interactions, resist unbuckling and uncuffing at the same time.
 2016-03-26 20:51:08 -04:00