cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-20 15:13:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,122 Commits 7 Branches 0 Tags
f64eae04bf45cc36701096885293c65fb8c5e717
Commit Graph

12698 Commits

Author SHA1 Message Date
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
4ac2f5f136 Removes unusable missiles from artificers 2014-05-04 01:28:24 +03: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
Mike
bc1a529683 Fixes for last two commits. 2014-05-03 11:40:20 -04: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
15fef13804 Space suit description text 2014-05-02 16:11:41 -04:00
Mike
673f4ca1bc Hardsuits 
Adjusted hardsuit values to match descriptions a little better. Returned
some atmos hardsuit values to eng ones since they don't seem to have
reduced slowdown after all, instead they trade radiation protection for
thermal protection.
Updated syndie hardsuit species excludes as those species now have their
own syndie hardsuits.
 2014-05-02 16:09:13 -04:00
Mike
946fd5329f Fixed null flag for cigarette type 2014-05-02 15:59:47 -04: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
Ccomp5950
0c0af93601 You can now request player notes through IRC bots. 2014-05-02 08:16:47 -05:00
Mloc
3e7ac27061 Merge pull request #4868 from valzargaming/master 
Fixes gum.dm firerate
 2014-05-02 10:12:15 +01:00
Mloc
ed83047156 Merge pull request #4871 from PsiOmegaDelta/NoMoreAssembly 
Vermin Infestation - Area correction
 2014-05-02 10:11:01 +01:00
Mloc
b62fbf63cb Merge pull request #4867 from mwerezak/hazard-vest 
Hazard vests can hold gasmasks and eng tape
 2014-05-02 10:09:47 +01:00
Mike
d684a77119 Fixes #4780 2014-05-01 23:58:47 -04:00
Ccomp5950
d6717177ad IRC-AdminPM is limited to 400 characters. 2014-05-01 21:24:09 -05:00
Hubblenaut
5b18ec42c4 Fixed Tape Recorders printing transcripts with a 'paper'-prefix 2014-05-02 02:17:46 +02:00
PsiOmega
4ac1b6a7e1 Replaces the now non-existing "unused assembly line" with another area. 2014-05-01 13:33:58 +02:00
Mloc
c1e6f9b0a6 Merge pull request #4866 from mwerezak/stunglove 
Fixes #4850
 2014-05-01 10:36:17 +01:00
Chinsky
78a381eff5 Merge pull request #4864 from Ravensdale/zetubes 
Fix for problem #2891
 2014-05-01 03:39:04 +04: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
valzargaming
5b289f53c5 Fixes gum.dm firerate 
Firerate will now properly report to the player what their firemode is set to.
 2014-04-30 18:23:42 -05:00
Chinsky
690be8e830 Merge pull request #4863 from mwerezak/shotgun-pump 
Fixes #4856
 2014-05-01 03:13:23 +04:00
Chinsky
eb6a34679f Merge pull request #4861 from Ccomp5950/oops 
Oops fix, "right_ear" and "left_ear" shouldn't have an underscore.
 2014-05-01 03:13:14 +04:00