Commit Graph

15022 Commits

Author SHA1 Message Date
Anewbe
b2aa116e29 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into plasmastun 2017-01-15 17:19:47 -06:00
Anewbe
4521a6a2c0 Merge pull request #2922 from Anewbe/crate_event
Ports Bay's Shipping Error event
2017-01-15 18:17:02 -05:00
Anewbe
7cd24d6c92 Merge pull request #2917 from Anewbe/carp
Space carp have a chance to stick around after their events
2017-01-15 18:16:54 -05:00
Anewbe
a379aa2779 Merge pull request #2911 from Anewbe/taj_chems
Applies various chem changes to Tajaran
2017-01-15 18:16:34 -05:00
Anewbe
8893640a42 Merge pull request #2920 from Anewbe/boot_knives_again
Tweaks the way bootknives work
2017-01-15 18:16:24 -05:00
Anewbe
93a3976ce1 Merge pull request #2919 from Anewbe/sifguard
Renames SCG Expeditionary Corps to Sif Homeguard Corps (SifGuard)
2017-01-15 18:15:04 -05:00
Anewbe
d16f09749d Merge pull request #2918 from Neerti/1/14/2017_minor_mic_circuit_fix
Fixes Small Bug in Microphone/EPv2 Circuit
2017-01-15 14:41:37 -05:00
Anewbe
46486249f0 Makes the automute less strict on timing 2017-01-14 23:06:24 -06:00
Anewbe
4b9258afbf Ports Bay's Shipping Error event 2017-01-14 18:34:34 -06:00
Anewbe
00dfa331f3 Renames SCG Expeditionary Corps to Sif Homeguard Corps (SifGuard) 2017-01-14 18:06:31 -06:00
Anewbe
80901d6c23 Tweaks the way bootknives work 2017-01-14 17:12:21 -06:00
Anewbe
d14096148a Adjusts removed, rather than strength for Taj things 2017-01-14 15:20:50 -06:00
MagmaRam
1351e5b013 Merge pull request #2890 from Anewbe/chem_spills
Fixes phoron/fuel spills not affecting the spilled-upon mob
2017-01-14 14:39:08 -06:00
Neerti
58b1b16be9 Also fixes EPv2 circuit not pushing data.
Also makes code compile.
2017-01-14 14:04:19 -05:00
Neerti
fadec38c59 Fixes Small Bug in Microphone Circuit
Microphone circuits should push data properly.
2017-01-14 13:52:34 -05:00
Anewbe
aa91f86845 Space carp have a chance to stick around after their events 2017-01-14 00:34:15 -06:00
Anewbe
3066d280ec Adds Neerti's proposal to the plasmastun thing 2017-01-13 16:18:05 -06:00
MagmaRam
39f5c4705c Merge pull request #2912 from Anewbe/baystation_cosmetic_things
Ports a bunch of Baystation's underclothes and hair
2017-01-12 18:08:37 -06:00
MagmaRam
5ffebc5e5a Merge pull request #2910 from Anewbe/flash_refix
Hugs/grabs should only miss if you're flashed
2017-01-12 17:37:25 -06:00
MagmaRam
2fc29c2f4c Merge pull request #2898 from Anewbe/spidereggs
Lowers spider egg implantation rate, warns victim
2017-01-12 17:37:18 -06:00
Anewbe
706eb0f265 Mostly ports Bay's plasma pulse stunner 2017-01-11 21:27:41 -06:00
Anewbe
1efa9988e3 Merge pull request #2909 from Neerti/1/9/2017_rip_blog
Adds new Server News
2017-01-11 22:20:53 -05:00
Anewbe
a4471556b1 Ports a bunch of Baystation's underclothes and hair 2017-01-11 19:12:49 -06:00
Anewbe
397f812451 Corrects an error in the previous commit 2017-01-11 17:26:52 -06:00
Anewbe
4f70a0e942 Applies various chem changes to Tajaran 2017-01-11 17:09:35 -06:00
Anewbe
415182d3b7 Hugs/grabs should only miss if you're flashed 2017-01-10 20:59:07 -06:00
Anewbe
e25c564019 Merge pull request #2906 from Neerti/1/7/2017_spam_preventer
Adds Automuting
2017-01-10 21:39:16 -05:00
Neerti
fdc2fe1fbc Adds new Server News
Adds ability for admins with R_SERVER perms to be able to set a persistant 'news' announcement that works similarly to admin memos, but for the public.  This is ideal for telling the public things such as when an event is scheduled, directing people to a forum thread, new lore changes, new policies, etc.
The news window allows to define a title, and the body of the text, using an admin verb.  The author and date are added automatically.
Any players can read the news window in the lobby.  The button will bold itself, and display (NEW!), if the player has not seen the news before.  This is done by comparing a hash of the body that the client remembers verses a hash the current news body.
2017-01-10 04:36:38 -05:00
Anewbe
60df31fc41 Merge pull request #2902 from Neerti/1/2/2017_circuit_permanent_revolution
Permanent Revolution Circuit DLC
2017-01-08 14:42:25 -05:00
Neerti
82ad098e33 Adds Automuting
Adds a system adapted from Aurora that will automatically mute someone if they say things too quickly in IC, OOC, Deadchat, Ahelp, or Pray.
2017-01-07 16:27:35 -05:00
Anewbe
8ae0c62d60 Merge pull request #2903 from Neerti/1/4/2017_flash_tweak
Make Flashes Great Again
2017-01-05 18:34:29 -05:00
Neerti
42807003f5 Makes halloss amount scale based on flash_strength 2017-01-05 02:30:52 -05:00
Neerti
a31e65782c Make Flashes Great Again
Hand-held flashes now do 30 halloss per flash, if the person lacks flash protection.
Hand-held flashes now can be used 10 times per minute instead of five, due to needing ~4 flashes to down someone.
Flash rounds do 20 halloss if the mob hit lacks flash protection.
2017-01-04 21:45:12 -05:00
Neerti
97ebf0924d Permanent Revolution Update 2017-01-04 04:41:30 -05:00
MagmaRam
e8e0b0403e Merge pull request #2897 from Anewbe/flash_things
Hands should now be affected by the flash accuracy penalties
2017-01-03 21:17:58 -06:00
Anewbe
5f1a99edfc Removes the last bit of Taj coffee poisoning 2017-01-03 14:28:18 -06:00
Anewbe
452e069fb1 Lowers spider egg implantation rate, warns victim 2017-01-03 14:09:20 -06:00
Anewbe
47f6946794 Hands should now be affected by the flash accuracy penalties 2017-01-02 21:57:13 -06:00
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
Anewbe
426bb55bfc Chems with touch_turf should now also do the proper touch_mob and affect_touch 2017-01-01 21:32:00 -06: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