cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,144 Commits 7 Branches 0 Tags
cee43ffbf3078a8834356cd4fea44c678c5a33d0
Commit Graph

6914 Commits

Author SHA1 Message Date
Mike
cee43ffbf3 Fixes internal storage on ground 
Fixes not being able to remove items from internal storage when the
master item is on the ground.
 2014-05-10 23:41:48 -04:00
Ccomp5950
699cbbfd96 Merge pull request #4941 from Zuhayr/dev 
Maintenance drones.
 2014-05-10 03:55:21 -05:00
Zuhayr
7ded31ce4c Merge pull request #4921 from Jarcolr/UnusedIcons 
Adds 5 satchels for jobs when selecting "satchel" for backpack pref from code
 2014-05-10 02:41:57 +09:30
Zuhayr
1fc3ecf145 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-05-10 01:56:57 +09:30
Zuhayr
1a24e08f36 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 2014-05-10 01:40:11 +09:30
Jarcolr
dd8ce90fa7 Else Ifs 2014-05-09 16:06:44 +03:00
Mloc-Argent
2d99a65cdf Merge remote-tracking branch 'upstream/master' into dev 2014-05-08 19:27:02 +01:00
Chinsky
5a3a32ec02 Merge pull request #4919 from Hubblenaut/paperwork 
Record Printout Changes and improved Console Interaction
 2014-05-08 13:16:20 +04:00
Chinsky
dbc6011018 Merge pull request #4928 from Ccomp5950/bugfixs 
[Bugfix] Fixes partial prints.
 2014-05-08 13:10:48 +04:00
Mloc
fa6e32ca5c Merge pull request #4922 from mwerezak/power 
Fixed cell chargers being infinite energy sources.
 2014-05-07 21:48:54 +01:00
Mloc-Argent
a2b85c31a4 Merge remote-tracking branch 'upstream/master' into dev 2014-05-07 17:37:29 +01:00
Ccomp5950
b7d455a64b [Bugfix] Fixes partial prints. 
Playays will now no longer leave complete prints from touching an item once.

Instead they will leave a partial print, that has a high chance of leaving more and more with each touch.

You have a 1/100 chance of leaving a full set of prints on your first touch.

Fixes #4176
 2014-05-07 02:17:08 -05:00
Zuhayr
0d597fe8db Merge pull request #4912 from Ccomp5950/mentors 
Adds Mentors.
 2014-05-07 10:00:27 +09:30
Zuhayr
a1f6b7a211 Merge pull request #4885 from mwerezak/equipment-fixes 
Misc Equipment fixes - Mostly hardsuits
 2014-05-07 09:59:44 +09:30
Mike
36dbb67ceb Fixed air alarm heaters using 1000x less power... 
...than they should. Note that MAX_ENERGY_CHANGE is 1000, so air alarm
heaters will now draw a maximum of 1 kW instead of 1 W, much more
befitting of a heater.
 2014-05-06 20:12:40 -04:00
Mike
a538357b3e Fixed cell chargers being infinite energy sources 2014-05-06 16:43:16 -04:00
Jarcolr
12d2d616c1 5 unique satchels when selecting "satchel" 
Enabled for RD, Xenobiologist , Scientist, Botanist, Virologist,
Geneticist, Chemist

http://puu.sh/8BqEX.png http://puu.sh/8BriB.png
 2014-05-06 16:54:23 +03:00
Hubblenaut
4dbd3252c9 No 'Record Lost' or different records when printing out Medical/Security Records and switching to another record 2014-05-06 05:37:03 +02:00
Hubblenaut
d1d42d7c35 Ability to access Medical Console by clicking it with ID card 2014-05-06 03:59:54 +02:00
Hubblenaut
7908142f16 Adds Station Time to Crew Manifest Printouts 2014-05-06 03:43:10 +02:00
Hubblenaut
0ddba6d771 Adds Crewmember's name to Medical and Security Record Printouts 2014-05-06 03:36:11 +02:00
Hubblenaut
d803f98ec1 Removes 'paper -' prefix from printed crew manifest 2014-05-06 03:20:13 +02:00
Mloc-Argent
6a11ca32f8 Merge remote-tracking branch 'upstream/master' into dev 2014-05-05 22:22:01 +01:00
Zuhayr
6adb394450 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-05-05 23:44:49 +09:30
Zuhayr
47ded267fb Merge pull request #4908 from Intercross21/master 
Some inner changes for admin verbs
 2014-05-05 23:37:49 +09:30
Zuhayr
5492531094 Fixes #4534 2014-05-05 17:18:55 +09:30
Zuhayr
c44e7b0e56 Fixes #4495. 2014-05-05 16:14:59 +09:30
Ccomp5950
fe4f9b0df9 Adds Mentors. 
Adds a config option MENTORS which sets the variable config.mods_are_mentors
Adds a rights level of R_MENTOR which gets msay, private message, aghost, notes, and a new proc for checking for new players (requires database support).

If the confic option for mentors is set then

	the ckeys listed in moderators.txt file will instead be set as mentors, you can still make moderators by adding them in admins.txt

	staffwho will show Mentors instead of Moderators as the heading above the listing of non-admins.

Also:  Players now get a message gently reminding them to click the name of the staff member to reply instead of ahelping over and over.
 2014-05-04 23:12:06 -05:00
Intercross21
aa7ad269ae Little change: "show" button shows job only first time. Now shows job anytime. 2014-05-05 07:20:26 +04:00
Intercross21
e05efd0f1e New job menu for ID computer. 2014-05-04 22:06:56 +04:00
Ccomp5950
a79eed717b Merge pull request #4900 from Jarcolr/Dicepack 
Added storage/misc.dm and moved dicepack to it
 2014-05-04 10:10:06 -05:00
Ccomp5950
3739ed03ff Merge pull request #4905 from Jarcolr/properhudobject 
Cyborg hud modules now have proper icon states
 2014-05-04 09:36:32 -05:00
Jarcolr
e050251c81 Cyborg hud modules now have proper icons 
Before: http://puu.sh/8yK5W.png
After: http://puu.sh/8yKYc.png
 2014-05-04 16:06:10 +03:00
Mloc
1f835cc9a4 Merge pull request #4892 from Loganbacca/trinary 
Gas mixer and filter variants
 2014-05-04 13:49:52 +01:00
Jarcolr
5bc9ea47e4 Added storage/misc for objs that don't fit in 
Also moved the dicepack there.
 2014-05-04 00:40:08 +03:00
Mloc-Argent
e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-03 16:56:19 +01:00
Zuhayr
0e39f18763 Compile fix. 2014-05-03 23:17:08 +09:30
Zuhayr
5b32150858 Fixes for previous commit, sigh. 2014-05-03 21:21:19 +09:30
Zuhayr
25c85d6e2a Adding some repair procs to cables and welders for IPC use. 2014-05-03 21:10:26 +09:30
Zuhayr
5ef994337b Fix for previous commit. 2014-05-03 20:13:20 +09:30
Zuhayr
0dfe70fe2b IPC will no longer take damage from walking in glass. Not sure why this was happening beforehand. 2014-05-03 20:08:45 +09:30
Mloc
5586439dc8 Merge pull request #4878 from mwerezak/horsemask 
Fixes  #4780
 2014-05-03 11:06:41 +01:00
Mloc
f0726e5cee Merge pull request #4881 from Ccomp5950/botfix 
Admin empowerment:  Allowing Admins in IRC to respond to ahelps
 2014-05-03 11:04:43 +01:00
Loganbacca
8e1ac09545 Trinary atmospheric device variants 
- Mirror filter - standard filter with the output mirrored to the opposite side
- T-Mixer - takes left and right inputs then outputs the mix perpendicular to the inputs
- Mirror mixer - standard filter with the output mirrored to the opposite side
- Added all three to pipe dispenser and construction code so they can be built in-game
 2014-05-03 22:01:33 +12:00
Mike
946fd5329f Fixed null flag for cigarette type 2014-05-02 15:59:47 -04:00
Mike
d684a77119 Fixes #4780 2014-05-01 23:58:47 -04:00
Hubblenaut
5b18ec42c4 Fixed Tape Recorders printing transcripts with a 'paper'-prefix 2014-05-02 02:17:46 +02:00
Chinsky
ebf9f86afd Merge pull request #4858 from mwerezak/webbing 
Storage and Clothing/Accessory Changes and Cleanup
 2014-05-01 03:38:19 +04:00
Ravensdale
b8696668a7 Fix for problem #2891 2014-04-30 08:20:44 -07:00
Mike
ba0dded672 Holsters and Unathi knife harness 
Also fixed mistyped path and OnClick bug.
 2014-04-29 22:43:10 -04:00