cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-21 07:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,766 Commits 6 Branches 0 Tags
ba36df71a7657bf6656c7b19f81b51e5b27875dc
Commit Graph

16690 Commits

Author SHA1 Message Date
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
Spades
4dd1192651 Merge pull request #820 from OrbisAnima/Fix--Promethean-colouration-error 
Fix promethean colouration error
 2017-01-12 14:44:14 -05:00
Spades
4a1c04a39e Merge pull request #821 from Cameron653/master 
Fixes #813
 2017-01-12 14:41:20 -05: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
BothNevarBackwards
36d2472546 Allows Human Type Mobs to Select a Primary Attack 2017-01-11 17:26:48 -05:00
Cameron653
57469d748b Fixes typos 2017-01-11 13:54:11 -05: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
killer653
6f95e6e6d3 Fixes #813. Credit to Aronai 
Fixes #813
 2017-01-10 21:30:18 -05:00
OrbisAnima
c11a9455c2 Fix: Promethean Colouration Error 
Fix #801, Avoids #818, sorry for #819, I had tested it, before, tested
it this time, this one should be inmune to any merge or shenanigans,
since I work as Aronai intended.
 2017-01-10 22:50:21 -03: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
Spades
c9579a3247 Revert "Fix: Promethean coloration error" 2017-01-09 20:42:41 -05:00
Spades
b19e1e191a Merge pull request #806 from OrbisAnima/Fix--Prometeans-color 
Fix: Promethean coloration error
 2017-01-09 15:00:15 -05:00
Spades
09cf2fc081 You're not a corgi. 2017-01-09 01:49:01 -05:00
Spades
8ad50bc34c Added Fluffy correctly. 
https://github.com/VOREStation/VOREStation/pull/811 except done
correctly.
 2017-01-09 01:46:19 -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
Spades
cda702a5ee Merge pull request #808 from BothNevarBackwards/fixHolder 
Makes teshari use the macro micro pickup mechanic rather than their default sprite and slot use.
 2017-01-07 14:54:34 -05:00
BothNevarBackwards
9acfde3a18 Makes teshari use the macro micro pickup mechanic rather than their default sprite and slot use. 2017-01-06 22:56:41 -05:00
Anewbe
2c86a0a465 Returns the Vox, who now breath Phoron 2017-01-06 17:49:39 -06:00
Spades
409effe5a9 Merge pull request #805 from OrbisAnima/Fix--Species-Age 
Fix: Added minimun age to 18, to go with the server policies
 2017-01-06 14:23:42 -05:00
OrbisAnima
ff73133b3a Fix: Promethean coloration error 
Fixes #801, I tested and everything seemed to work, but given the nature
of organ_icon, I suggest someone else checks it too.
 2017-01-06 15:48:54 -03:00
OrbisAnima
44571603fe Fix: Added minimun age to 18, to go with the server policies 2017-01-06 15:17:37 -03:00
Screemonster
74a67c3010 Forgot to remove myself from the whitelist after testing 2017-01-06 10:57:19 +00:00
Screemonster
8733de2583 Adds Miria's ears and tails 2017-01-06 10:52:38 +00: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
ebe5a5c9d9 Merge remote-tracking branch 'refs/remotes/origin/master' into dev-ace 2017-01-02 03:38:29 -05:00
Spades
0157cc7049 Some fixes. 
- Fixes alien mobs being invisible.
- Alters weight rate messages to be clearer.
 2017-01-02 03:38:20 -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
Cameron653
8cef69e9df Makes mushroom sprites show up correctly when harvested (#788) 2016-12-30 23:06:57 -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