cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,840 Commits 5 Branches 0 Tags
d5cfa73f9bdfa29adabffa5eb2bac5a8045d2af0
Commit Graph

14983 Commits

Author SHA1 Message Date
Anewbe
d5cfa73f9b Merge pull request #2893 from SpadesNeil/Pirate-Nerf 
Nerfs NPC Pirate
 2017-01-02 10:47:38 -05:00
Spades
88b5f0b8f4 Nerfs NPC Pirate 
Rapid firing /obj/item/projectile/beam? How about no? That's 120 damage
in a split second. With the new way burn damage affects players; fuck
that!
 2017-01-02 02:23:37 -05:00
MagmaRam
4ac540d14c Merge pull request #2888 from Anewbe/fbp_monitor 
Vital Damage on FBPs is now tracked on the crew monitor
 2017-01-01 19:17:47 -06:00
Anewbe
2f8415f18c Vital Damage on FBPs is now tracked on the crew monitor 2016-12-31 21:10:07 -06:00
Anewbe
24fcd2523b Farmbots can be constructed again 2016-12-31 17:16:34 -06:00
Anewbe
dc89eb5700 Merge pull request #2880 from Neerti/12/29/2016_circuit_autoresearch 
Makes Circuits Make Their Own Research Designs
 2016-12-31 10:11:41 -05:00
MagmaRam
9980f80e57 Merge pull request #2863 from Anewbe/brains_and_such 
Circuits should work like posibrains now
 2016-12-30 21:56:09 -06:00
MagmaRam
5eded6277b Merge pull request #2866 from Anewbe/LIMBFIGHT 
Limbs and heads now have a force and throwforce value
 2016-12-30 21:49:24 -06:00
Anewbe
a3e1d14430 Merge pull request #2871 from Atermonera/sheet_loader 
Sheet loader can fill protolathes and circuit imprinters
 2016-12-30 22:13:38 -05:00
Neerti
cefd8029f7 Makes Circuits Make Their Own Research Designs 
Circuits generate a research design datum when the game starts up instead of me having to manually define them every time I make a new circuit.  Hopefully this reduces missing circuits due to mistakes.  The circuit box also spawns specific circuits using a similar method for similar reasons.

Other things this does:
Splits the reagent related manipulation circuits to their own category, which cleans up a few repeated New()s.
 2016-12-30 02:41:11 -05:00
MagmaRam
c04bc85731 Merge pull request #2870 from Neerti/12/21/2016_circuit_fixes 
Arithmetic Circuit Additions and Fixes
 2016-12-29 20:19:07 -06:00
Atermonera
0fa8a280cf Sheet loaders can feed protolathes and circuit imprinters 2016-12-21 16:47:26 -08:00
Neerti
c32e18ae8b Arithmetic Circuit Additions and Fixes 
Subtraction, multiplication, and division should work properly.
Added sign, round, and exponent circuits.
 2016-12-21 14:52:16 -05:00
Anewbe
525643eb02 Merge pull request #2865 from MagmaRam/fifty_stacks 
Replaces [stack]/fifty atoms with atoms that spawn the normal stack
 2016-12-19 17:14:37 -06:00
Anewbe
c6315ca7f0 Merge pull request #2864 from Atermonera/Fixes_#2630 
Gripper Fixes, round one.
 2016-12-18 16:42:03 -06:00
MagmaRam
aa0ae1c676 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into fifty_stacks 2016-12-18 13:43:20 -06:00
Anewbe
bbd86b7646 Merge pull request #2862 from MagmaRam/beakerlabel 
Labels for beakers can now be longer, and are in the description, too.
 2016-12-18 13:40:51 -06:00
Anewbe
a9c1d34518 Limbs and heads now have a force and throwforce value 2016-12-17 17:33:21 -06:00
MagmaRam
190a2bc70c Replaces [stack]/fifty atoms with atoms that spawn the normal stack 
The stack/fifty objects were really buggy, this should fix all of that in one go.
 2016-12-17 17:27:04 -06:00
Atermonera
9669505550 Removes debug messages, adds Exosuit Tracking Beacon to the exosuit gripper's list. 2016-12-17 15:08:02 -08:00
Anewbe
b092c624a9 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into movement_speeds 2016-12-17 16:05:44 -06:00
Anewbe
6353b365b4 Circuits should work like posibrains now. 2016-12-17 15:49:59 -06:00
Atermonera
82a33d16d9 Causes attackby() to happen. 2016-12-17 13:02:52 -08:00
MagmaRam
4d8c2aaa3e hurf durf dumb html mistake 2016-12-17 10:25:59 -06:00
MagmaRam
52f3ee7e19 Labels for beakers can now be longer, and are in the description, too. 2016-12-17 09:47:05 -06:00
MagmaRam
4e27e439ca Merge pull request #2857 from Anewbe/another_language_selection 
Adds another language selection point
 2016-12-16 17:54:24 -06:00
Anewbe
c872ee2093 Adds another language selection point 2016-12-15 18:47:50 -06:00
Anewbe
5c41c32dc9 Adds device cell to the loadout 2016-12-15 18:19:48 -06:00
Anewbe
6d7d5af896 The TSC jumpsuits should be properly selectable now. 2016-12-11 16:50:04 -06:00
woodratt
9e20a8cf15 Dress bugfix 
Fixes the issue of dresses using the greydress sprite for on mob sprites.
 2016-12-10 01:29:12 -08:00
MagmaRam
f256342b09 Merge pull request #2850 from ForFoxSake/gunsarenttoys 
Corrects the Shotgun Sawing Procedure
 2016-12-09 22:53:40 -06:00
MagmaRam
7e1e710df5 Merge pull request #2847 from Woodratt/1.6.6_shoes_n_gloves 
1.6.6 shoes and gloves
 2016-12-09 22:53:32 -06:00
MagmaRam
675479283d Merge pull request #2844 from Anewbe/eva_gloves 
EVA hardsuit gets insulated gauntlets
 2016-12-09 22:51:37 -06:00
ForFoxSake
3e0af860e9 Makes the shotgun go off if it's modified while loaded. 2016-12-09 13:22:04 +00:00
ForFoxSake
89d4e3b824 Fixes SMES power window from throwing runtimes while in construction. 2016-12-09 13:05:57 +00:00
woodratt
ad92bc899b 1.6.6 shoes and gloves 
Adds shoes and gloves from Bay.

Forensic gloves added to the loadout, detective only.
Work gloves added to the loadout.
Tactical gloves added, not to loadout.
Cowboy boots added (existing sprite, loadout)
Jungle boots and Duty boots added, (loadout).
Dress shoes added white and black, (loadout).
Fixed pathing issue with purple beret.
 2016-12-08 20:59:04 -08:00
Anewbe
a8aa9d1cfa Tweaks walking speed 2016-12-08 21:26:37 -06:00
Anewbe
bf9c76ee3c Merge pull request #2839 from MagmaRam/EAL_implant 
Adds an implant that allows humans to speak EAL.
 2016-12-07 21:39:45 -06:00
Anewbe
bcc6ac03e3 EVA hardsuit gets insulated gauntlets 2016-12-07 17:41:42 -06:00
MagmaRam
95aa0d152d Finally got around to implementing Zuhayr's suggestion. 2016-12-06 20:16:42 -06:00
ForFoxSake
716c89b8cd Fixes water-cooler runtime. 2016-12-06 22:38:52 +00:00
MagmaRam
c5b77fcf9e Adds an implant that allows humans to speak EAL. 
It's available in the loadout for 2 points.
 2016-12-01 22:22:46 -06:00
Anewbe
16bea57254 Merge pull request #2836 from Woodratt/1.6.5_Uniforms 
1.6.5 Port of Bay's uniforms
 2016-11-30 15:37:51 -06:00
woodratt
5444a4ad52 1.6.5 Port of Bay's uniforms 
- Port of all of the uniform items that we did not have.
- Aether, Sweater, Ward-T. Frontier, Focal, Heph. Grayson, M. Bill, PCRC outfits/uniforms ported. (Loadout, some restricted)
- All of the military jumpsuits and uniforms have been ported. (Not Avail).
- Plain utility outfits are available in the loadout, as well as the pt outfits (except for marine).
- Hazard, Sterile, Saare, and Confederate outfits ported. (Not Avail).
 2016-11-29 03:07:18 -08:00
Anewbe
1c7b32787b Skrell chem changes 2016-11-27 19:18:02 -06:00
MagmaRam
5bf3cd725f Merge pull request #2833 from Anewbe/skrell_numbers 
Adjusts some Skrell numbers so they like warm and dark
 2016-11-27 17:45:48 -06:00
MagmaRam
77cbab5704 Merge pull request #2831 from Anewbe/singlang_again 
Signlang should now work while muzzled.
 2016-11-27 17:45:27 -06:00
Anewbe
b7a2c5efd4 Lungs that are repaired will stop causing oxyloss 2016-11-27 16:50:17 -06:00
Anewbe
c5d77d2b6e Adjusts some Skrell numbers so the like warm and dark 2016-11-27 16:20:45 -06:00
Anewbe
f725bbcaad Signlang should now work while muzzled. 2016-11-26 23:37:49 -06:00