cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,021 Commits 10 Branches 0 Tags
b80cdb6e9f5364b370b13bcd02a47a9bbed9d288
Commit Graph

12624 Commits

Author SHA1 Message Date
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
Mloc
1f835cc9a4 Merge pull request #4892 from Loganbacca/trinary 
Gas mixer and filter variants
 2014-05-04 13:49:52 +01: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
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
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
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
Mike
ec5144ce01 Hazard vests can now hold gasmasks and eng tape 2014-04-30 16:39:48 -04:00
Mike
fc7946a308 Fixed #4850 
Cutting wires from stun gloves cuts the fingertips off randomly
 2014-04-30 14:11:34 -04:00
Ravensdale
b8696668a7 Fix for problem #2891 2014-04-30 08:20:44 -07:00
Mike
f3b0ee8a43 Fixes #4856 
Shotgun pumping not playing
 2014-04-30 10:38:30 -04:00
Mloc-Hibernia
2040c5a720 controllers: make process_machines more profilable 
Splits process_machines() into 3 procs for its actions, trying to
figure out which is causing the lagspikes.

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2014-04-30 09:56:55 +00:00
Ccomp5950
df0fe76155 Ooops fix, "right_ear" should be "right ear". 2014-04-30 04:03:55 -05:00
Hubblenaut
87d4cf7238 Photocopiers now copy stamped papers, also minor bugfix 2014-04-30 05:46:51 +02:00
Mike
55e103ee7a Fixed holster verb runtime 2014-04-29 23:22:40 -04:00
Mike
ba0dded672 Holsters and Unathi knife harness 
Also fixed mistyped path and OnClick bug.
 2014-04-29 22:43:10 -04:00
Mike
ae49ba210b Webbings now use internal storage 
Clothing no longer manipulates webbing members for better encapsulation.
Instead attackby() and attack_hand() are forwarded to accessories if
they are present.
Removed "Look in Storage" verb for less verb clutter.
 2014-04-29 20:34:01 -04:00
Chinsky
224fa5e8f9 Merge pull request #4847 from Ravensdale/atmosia 
Atmos mainline pipe code moved and enabled.
 2014-04-30 04:07:01 +04:00
Chinsky
d709c3c9c5 Merge pull request #4853 from Ccomp5950/ghostwrite_runtime 
Fixes runtime that stops ghosts from ghostwriting...yay 4 month old bugs
 2014-04-30 04:05:47 +04:00
Ccomp5950
7f5b5bb5af Merge pull request #4851 from thelegendofbrian/pAI 
pAI GUI Massive Update
 2014-04-29 18:49:54 -05:00
Mike
172bda548e Fixed internal storage, added coat pockets 
/mob/proc/ClickOn() now checks storage levels, not just contents levels,
now allows items to be taken out of internal storage attached to another
item.
Coats now use internal storage for their pocket slots, removed duplicate
storage code.
Moved coat.dm out of it's special folder and into modules/clothing.
 2014-04-29 19:00:36 -04:00
Mike
74009f8332 Fixed hats not being pocketable 
Made shoes pocketable again too, why not.
 2014-04-29 15:42:29 -04:00
Mike
1e5ad59b8c More sensible clothing w_class 
Helmets, suits, shoes, and large articles of clothing now have a more
appropriate w_class = 3. Slippers are small enough to have w_class = 2.
 2014-04-29 14:42:22 -04:00
Mike
51f8bfe3ce Fixed accidentally omitted call to parent 2014-04-29 09:37:25 -07:00
Mike
591df34c86 Removed broken backpack unequipping sound 2014-04-29 09:20:21 -07:00
Mike
5a797b8d03 Add internal storage type 2014-04-29 09:18:17 -07:00
Mloc
352f212689 Merge pull request #4848 from Ccomp5950/supermatter 
Deadlier supermatter.  If you don't add coolant, you will have a bad time
 2014-04-29 16:37:45 +01:00
Mloc
ca67af9d4f Merge pull request #4846 from Ccomp5950/ear_fix 
Radio :r and :l fixes and feature.
 2014-04-29 09:38:53 +01:00
Ccomp5950
e3dd035aa7 Fixes runtime that stops ghosts from ghostwriting...yay 4 month old bugs. 2014-04-29 03:30:50 -05:00
Brian Cook
96d1609bda Reverted "Paroled" to "Parolled" 
To avoid conflicts with other variables and spellings.
 2014-04-28 20:20:30 -07:00