cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,740 Commits 8 Branches 0 Tags
9f4ff63d11ed9eadda9535a3f1d94e68f0eb1c24
Commit Graph

13590 Commits

Author SHA1 Message Date
Yoshax
9f4ff63d11 Makes being muted from something more visible 2016-03-16 20:29:18 +00:00
EmperorJon
c27a69b24a Merge pull request #1193 from redstryker/master 
Adds Security Skirts, A Poncho, And Some Fixes
 2016-03-16 19:04:42 +00:00
Hubblenaut
a8fd336be9 Amends gargle blaster recipe 2016-03-16 17:56:02 +01:00
redstryker
93def97663 Removed Armor and Siemens Coefficient from Skirts 2016-03-16 08:28:43 -04:00
redstryker
1a0a517f47 Adds Security Skirts 2016-03-15 23:04:26 -04:00
Yoshax
5cc4b397fe Adds new hair, ported from bay 2016-03-14 22:34:18 +00:00
Neerti
634bab54e5 Merge pull request #1173 from Datraen/TraitorBorgFix 
Traitor Borg lockdown, blowing-up fixed; can now self-hack.
 2016-03-14 08:52:30 -04:00
Neerti
1c18d9cb73 Merge pull request #1174 from Mark9013100/3/12/2016mercnuke 
Gives the mercs a nuke...
 2016-03-14 08:48:33 -04:00
Kelenius
79e850f4d7 Fixes chemical explosions 2016-03-14 12:21:35 +03:00
Mark9013100
037de7086d Gives the mercs a nuke 2016-03-14 02:55:52 -04:00
Datraen
1b40fb3bfe Traitor Borg lockdown, blowing-up fixed; can now self-hack. 2016-03-12 17:03:28 -05:00
EmperorJon
2aa4e7727c Merge pull request #1167 from PolarisSS13/3/11/2016_leg_guard_fix 
Fixes oversight in leg-guard slowdown.
 2016-03-12 19:32:39 +00:00
EmperorJon
a730a61478 Merge pull request #1172 from redstryker/Turbans+Kippot 
Adds Turbans and Kippot and a Hoodie (V2)
 2016-03-12 19:31:15 +00:00
EmperorJon
27842e182e Merge pull request #1166 from Yoshax/splitundie 
Splits underwear into top underwear and bottom underwear
 2016-03-12 19:30:38 +00:00
redstryker
5f7443c063 Adds Turbans and Kippot 2016-03-12 12:34:41 -05:00
Kelenius
89ff4f5fc3 Adds ..() to /obj/structure/New() 2016-03-12 14:13:13 +03:00
Yoshax
3b5a027025 Merge remote-tracking branch 'upstream/master' into splitundie 2016-03-12 02:27:54 +00:00
Neerti
e43993b11b Fixes oversight in leg-guard slowdown. 
The slowdown was effectively 2 instead of 1 as intended, totaling 3 slowdown for the full set, which is more than the voidsuit slowdown, iirc.
 2016-03-11 21:13:59 -05:00
Yoshax
ea32fb2bd0 Fixes errors 2016-03-12 01:53:02 +00:00
EmperorJon
39a2008432 Merge pull request #1142 from Hubblenaut/cash 
Retail Scanners, Price List Update and Interface Improvements
 2016-03-11 23:37:43 +00:00
EmperorJon
40df50e5a2 Merge pull request #1131 from Hubblenaut/barrecipes 
Fixes two bar recipes
 2016-03-11 21:03:15 +00:00
EmperorJon
7734092d85 Merge pull request #1160 from Mark9013100/3/11/2016nomoreslides 
Removes the need for slides in forensics
 2016-03-11 21:00:48 +00:00
EmperorJon
78c53866c2 Merge pull request #1150 from Kelenius/noSplash 
Removes splash code
 2016-03-11 20:47:40 +00:00
Yoshax
b2916bbb56 Splits underwear into top and bottom 2016-03-11 19:26:50 +00:00
Kelenius
03a8b46e97 Fixes a roundstart runtime 2016-03-11 12:16:24 +03:00
Mark9013100
905bda9b2d Removes the need for slides in forensics 2016-03-11 03:53:12 -05:00
Kelenius
974a2a8216 Removes splash code 
Unused
 2016-03-10 10:55:35 +03:00
Kelenius
069a2e52a9 Fixes #1145 
Restores 'AI IM' verb tab
 2016-03-10 10:30:07 +03:00
Neerti
d412c0a070 Merge pull request #1134 from Kelenius/moreDrills 
Constructible drills
 2016-03-09 20:52:58 -05:00
Hubblenaut
0331ca9242 Extensive Interface Improvement 2016-03-10 01:12:49 +01:00
Hubblenaut
2c815af526 Adjusts price cumulation and logs 2016-03-09 19:06:58 +01:00
Hubblenaut
6ea7295e87 Updates price list 2016-03-09 17:40:11 +01:00
Mark9013100
4963d5a858 New combat helmet sprite 2016-03-08 21:37:04 -05:00
Datraen
be4564d30e Merge pull request #1128 from Hubblenaut/cash 
Retail Scanner, Fixes and QOL
 2016-03-08 16:40:02 -05:00
Datraen
bddc51e657 Merge pull request #1125 from Neerti/2/28/2016_armor 
A Load of Armor Changes
 2016-03-08 16:32:42 -05:00
Kelenius
63e8fbab46 Constructible drills 
Mining head circuit available in R&D
Mining brace circuit added
Mining braces can be built and disassembled
 2016-03-08 20:46:31 +03:00
Hubblenaut
64501e9937 Fixes two bar recipes 2016-03-07 20:18:14 +01:00
Hubblenaut
0a85f0c0fa Retail Scanner QOL 
Adjusts Size to fit in pocket
Fits in belt slot
Adds technology level for deconstructor (MT 1)
Ability to swipe when shown by show_held_item
 2016-03-07 19:50:49 +01:00
Hubblenaut
dc092aa348 Changes interface to using /interact and provided procs 2016-03-07 18:34:38 +01:00
Hubblenaut
42c73e1c8b Fixes ethanol drink pathing 2016-03-07 17:05:30 +01:00
Neerti
daf632ddc3 Fixes Teshari Permastun 
The game had it hardcoded to set halloss to 99, while it triggers for teshari at 50, resulting in an infinite loop.
 2016-03-06 06:55:56 -05:00
Neerti
2420ed3867 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/28/2016_armor 2016-03-06 04:19:33 -05:00
Neerti
d4793de3a0 Adds a bunch of stuff for sec armor. See PR for details. 2016-03-06 04:18:39 -05:00
Jon
dd0c03c861 Sol Government faxes now go to the Sif Governmental Authority. No more sending faxes to the UN/NATO. :P 2016-03-05 20:49:31 +00:00
Neerti
b4b8d94723 Merge pull request #1015 from Zuhayr/xenosremove 
Removes xenormorphs.
 2016-03-04 12:34:13 -05:00
Neerti
6224e978a9 Merge pull request #1014 from Zuhayr/voxremove 
Removed the Vox Pox.
 2016-03-04 12:32:23 -05:00
Jon
f0d5fcc5a4 Removes "Long Hair Alt" and "Shoulder Length Hair Alt" as they are identical to "Longer Fringe" and "Long Fringe" respectively. By identical to, I don't mean the sprites are the same - I mean they reference the exact same sprite! This has been a thing for a long time, for my knowledge, so people that have it set in their preferences may get some unexpected baldness - they should be able to fix that with mirrors fine if they don't notice before joining, though. 2016-03-02 22:19:15 +00:00
Kelenius
b9a9a7eb88 Merge branch 'master' into botFixes 2016-03-01 14:48:24 +03:00
Hubblenaut
0cdde3493c Fixes cash mashine department linking on spawn 2016-02-28 22:35:50 +01:00
Hubblenaut
a844828f23 Fixes Cash Machines not connecting to account on spawn and having omnidirectional interaction area 2016-02-28 22:16:23 +01:00