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
17,065 Commits 10 Branches 0 Tags
7908142f16fab45249daa3a61f68e85c7800924f
Commit Graph

12661 Commits

Author SHA1 Message Date
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
Mloc
e53d384321 Merge pull request #4909 from Ccomp5950/dionaea_say_code 
Dionaea nymphs now using new say code and get languages again.
 2014-05-05 20:56:27 +01:00
Zuhayr
87d29b25fd Merge pull request #4916 from Intercross21/master 
And another hotfix for #4908
 2014-05-06 01:15:42 +09:30
Intercross21
0e40a3f2dd And little more fixes 2014-05-05 19:38:09 +04:00
Zuhayr
089e23d7f2 Merge pull request #4915 from Intercross21/master 
Emergency hotfix for #4908
 2014-05-06 01:05:26 +09:30
Intercross21
cef243188a AH with link 2014-05-05 19:25:50 +04:00
Zuhayr
47ded267fb Merge pull request #4908 from Intercross21/master 
Some inner changes for admin verbs
 2014-05-05 23:37:49 +09:30
Intercross21
aa7ad269ae Little change: "show" button shows job only first time. Now shows job anytime. 2014-05-05 07:20:26 +04:00
Ccomp5950
c8c67da6ac Dionaea nymphs now using new say code and get languages again. 
dionaea will understand and be understood by humans if they have stolen any blood, it's assumed they learned common.

and a minor fix in hear_say for observers to not get not see simple_animals in (parens) since they have no real_name.
 2014-05-04 16:11:10 -05:00
Intercross21
e05efd0f1e New job menu for ID computer. 2014-05-04 22:06:56 +04:00
Mloc
8168635929 Merge pull request #4906 from Ccomp5950/herpderp 
Saycode herp derp.  client check checking speaker client instead of hearers
 2014-05-04 17:07:50 +01:00
Intercross21
d4ee83666e Now AH shows key, prefs.jobs not have scrollbar, prefs is fully visible except undo/save menus. 2014-05-04 19:41:14 +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
b80cdb6e9f Merge pull request #4898 from Jarcolr/LookAtThis 
Attacking with a book/paper while targetting eyes shows the book/paper 's contents
 2014-05-04 10:08:47 -05:00
Ccomp5950
c7262a55d4 Merge pull request #4897 from Mloc/bs12-zeroburn 
zas: fix zburn /0 runtime
 2014-05-04 10:06:02 -05:00
Intercross21
11e5c64c78 Unified interface for options of admin 2014-05-04 18:37:42 +04: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
Ccomp5950
93bee94c10 Saycode herp derp. client check checking speaker client instead of hearers. 2014-05-04 09:27:14 -05:00
Intercross21
02ce933297 Larger job and preferences windows but still lesser than 764. More choices in "Quick Create Object" menu. 2014-05-04 18:11:11 +04: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
Mloc
ce376eda1d Merge pull request #4894 from Zuhayr/master 
IPC fixes.
 2014-05-04 13:49:00 +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
Jarcolr
76b65f59a9 Targeting eyes with book/paper shows book/paper 
This is a way to show other players papers without giving them the
paper/book.
 2014-05-03 19:56:55 +03:00
Mloc-Argent
3fb37ade17 zas: fix zburn /0 runtime 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-03 17:40:35 +01:00
Mloc
6683cece0b Merge pull request #4895 from Ccomp5950/irc-pm-fix 
Canceling an IRC-adminPM will not send a blank message.
 2014-05-03 17:10:27 +01:00
Mloc
c05547820d Merge pull request #4883 from mwerezak/hidetail-dev 
Added HIDETAIL flag for suits
 2014-05-03 17:04:32 +01: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
Ccomp5950
ed25b7c870 Canceling an IRC-adminPM will not send a blank message. 
Ooops
 2014-05-03 09:27:59 -05:00
Zuhayr
0e39f18763 Compile fix. 2014-05-03 23:17:08 +09:30
Ccomp5950
d2b5f24545 Trimming messages prior to say code processing. 
Hoping to fix any whitespace issues that stop processing of emotes and radio/language channels
 2014-05-03 08:44:26 -05:00
Zuhayr
3d693a5f38 Several IPC adjustments. 2014-05-03 21:29:10 +09:30
Zuhayr
1a2ad49b8e Removed 'You are now sterile' line from groin loss due to spam issues when lost by an IPC as well as general pointlessness. 2014-05-03 21:27:49 +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
c526b9c29a Lousy goddamn indentation. 2014-05-03 21:09:55 +09:30
Zuhayr
378e6865d4 Attempting to stop IPC from eating and drinking. 2014-05-03 20:25:36 +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
Mloc
270724bfc8 Merge pull request #4877 from Hubblenaut/dev 
Fixed Tape Recorders printing transcripts with a 'paper'-prefix
 2014-05-03 11:04:07 +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
Zuhayr
5bd34ff950 Merge pull request #4887 from Mloc/bs12-mprf2 
mob: fix for say code "randomly" breaking
 2014-05-03 12:13:07 +09:30
Mloc-Argent
56ea5c26bb mob: fix for say code "randomly" breaking 
There was a runtiming check for mob.locs[1] in living/say, that would
fail if a mob was in bluespace.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-02 22:28:21 +01:00
Mike
449cac1386 Added HIDETAIL to suit items where appropriate 
Only looked at suits that already had a HIDEJUMPSUIT flag.
 2014-05-02 11:54:37 -04:00
Mike
01a5e64e65 Added HIDETAIL flag for suits 2014-05-02 11:53:31 -04:00