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

24448 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
MagmaRam
64279c9e67 Merge pull request #2889 from Anewbe/thermite 
Lasers can ignite thermite
 2017-01-01 19:16:54 -06:00
MagmaRam
40b1eb1990 Merge pull request #2881 from Anewbe/tapes 
Improves QoL for universal recorders
 2017-01-01 19:15:57 -06:00
MagmaRam
52719d9bdb Merge pull request #2887 from Anewbe/watertank 
Farmbots can be constructed again
 2017-01-01 19:14:18 -06:00
Anewbe
2210a41922 Merge pull request #2885 from Neerti/12/30/2016_circuit_map 
Adds Circuit Room to Science
 2017-01-01 14:23:32 -05:00
Anewbe
ae0d017763 Lasers can ignite thermite 2016-12-31 22:33:17 -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
Neerti
d28d3c1b99 Adds Circuit Room to Science 
Adds a smallish room in the back of research which has a circuit printer, some circuit assemblies, and a circuit box.  Also has space mountain wind and cheese honkers by request of Woodrat.
 2016-12-31 17:33:42 -05: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
4ef3cf7ff1 Improves QoL for universal recorders 2016-12-30 21:35:44 -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
593c19ed03 Merge pull request #2876 from Neerti/12/27/2016_lighting_fix_hopefully 
Fixes floor lighting bug
 2016-12-29 20:19:23 -06: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
Neerti
a8e5c62b9f Fixes floor lighting bug 
When a floor was created, it would always be dark at a distance until nearby light sources turned off and on again.  This should fix that problem by forcing the overlay to update upon turf being changed.
 2016-12-27 15:53:54 -05: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
a45b1ab846 Merge pull request #2861 from MagmaRam/defibcrate 
Adds a crate with defibrilators for 30 points
 2016-12-18 13:40:42 -06:00
Anewbe
6db74d7648 Merge pull request #2859 from Neerti/12/17/2016_vending_throw_fix 
Vending machines now correctly throw products
 2016-12-18 02:10:20 -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
f9d7ad9d16 Walking barefoot no longer slows you. 2016-12-17 16:07:38 -06: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
d3be058c5d Adds a crate with defibrilators for 30 points 2016-12-17 09:46:05 -06:00
Neerti
68b1a3e355 Vending machines now correctly throw products 2016-12-17 03:30:14 -05:00
Anewbe
a1a17a0811 Merge pull request #2858 from Woodratt/1.6.7_Map_Changes 
Fancy Map Change DLC
 2016-12-16 20:44:29 -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
woodratt
5825f74f2b Fancy Map Change DLC 
For more details see this thread http://ss13polaris.com/forums/viewtopic.php?f=18&p=12482&sid=941d47c798cf146ebc711c87cdf1cb22

- T-Comms turret control should be fixed, yet again.
- Maintenance door added to Medical breakroom
- Windoors in the armory fixed.
- Slight adjustments to where the carp spawns have been placed.
- Exterior window added to research maintenance.
 2016-12-16 02:53:43 -08: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
MagmaRam
e38a0bf06e Merge pull request #2848 from ForFoxSake/pestcontrol 
Fixes Runtime in SMES
 2016-12-09 22:51:18 -06:00