cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,080 Commits 8 Branches 0 Tags
4a206aabf0357c979e261082eaf4d901b1068afd
Commit Graph

25222 Commits

Author SHA1 Message Date
killer653
4a206aabf0 Adds in inkling hair 
Adds in Molenar's inkling hair (Had to be put under ears due to not
being able to ckey lock normal hair)

Adds in normal inkling hair.

Fixes #825
 2017-01-22 10:40:29 -05:00
Cameron653
5d2fa0db2c Fixes #857, adds sanity check to dogborgs 
Fixes #857
 2017-01-22 10:22:08 -05:00
Spades
edd6d713c9 Merge pull request #822 from BothNevarBackwards/attkChoose 
Allows Human Type Mobs to Select a Primary Attack
 2017-01-19 00:39:34 -05:00
Spades
9b61d10a0a Merge pull request #837 from Cameron653/master 
January Polaris Sync and various fixes
 2017-01-19 00:39:08 -05:00
Spades
24504b416f Merge pull request #847 from Dhaeleena/SecurityRework 
Even more map changes.
 2017-01-19 00:37:01 -05:00
Spades
48c95efa2b Merge pull request #849 from VOREStation/lcvend 
Life crystal tweaks
 2017-01-19 00:36:13 -05:00
Spades
d7c272bfa2 Merge pull request #851 from VOREStation/rigchange 
Rig changes
 2017-01-19 00:34:06 -05:00
Arokha Sieyes
c299c7ce22 Rig changes 
Reduced armor further, removed stealth field. Paramedics probably don't need those.
 2017-01-18 20:20:45 -05:00
Arokha Sieyes
d27cef2d5e Life crystal tweaks 
Adds to medical vendors (the big ones, not the wall ones), tweaks case name to be more normal. Includes in the examine text of the crystal that you can attach it to jumpsuits to remind people.
 2017-01-18 11:38:04 -05:00
Dhaeleena
b81c59989b Fixes all around the map. Edited the security Storage lightly, gave the warden a new desk to hand out stuff. Security Vendor now has Police tape, peper spray, Tasers and stun revolvers. Added Shutters to the Public Gateway acces. Lots of tiny fixes and edits all over the place. 2017-01-18 07:53:20 -03:00
Spades
3cda1a9bd3 Merge pull request #839 from VOREStation/langfix 
Further language implant fix
 2017-01-17 01:10:38 -05:00
Cameron653
93351c47af Merge branch 'master' into master 2017-01-16 22:30:45 -05:00
Arokha Sieyes
243a732a33 Fixes Verin's trenchcoat 
Forgot some lines and it should have been fluff path anyway
 2017-01-16 16:12:10 -05:00
Arokha Sieyes
e4b6ace4d5 Further language implant fix 
It just can't be a child of the other language implant at all.

Fixes #838
 2017-01-16 15:33:01 -05:00
Cameron653
300dd33e51 Fixes the floorlength braid... again 2017-01-16 15:07:27 -05:00
killer653
712f5610fb Wickedtemp custom items 
Adds a fixed sprite for Wickedtemp's health hud
Adds a custom taur sprite for Wickedtemp
 2017-01-16 00:45:30 -05:00
killer653
832418c7c9 Polaris sync 2017-01-15 18:12:15 -05:00
Arokha Sieyes
4e1dd1d237 Merge pull request #835 from VOREStation/arosuit 
Event medic suit
 2017-01-15 17:21:08 -05:00
Arokha Sieyes
7dd40a12be Event medic suit 
Basically a medic suit for me for events or gateway missions or whatever. Doesn't spawn.
 2017-01-15 17:10:42 -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
Spades
34ef727794 Merge pull request #830 from VOREStation/ealimplant 
Fix language/EAL implant.
 2017-01-15 14:24:54 -05:00
Spades
b0a98c173d Merge pull request #829 from VOREStation/verin 
Verin Fluff Coat
 2017-01-15 14:23:34 -05:00
Anewbe
46486249f0 Makes the automute less strict on timing 2017-01-14 23:06:24 -06:00
MagmaRam
f84e063115 Merge pull request #2895 from Anewbe/changeling_canban 
Might fix changeling bans
 2017-01-14 14:39:26 -06:00
MagmaRam
e6ac388471 Merge pull request #2891 from Anewbe/cyber_scan 
Robolimbs no longer show up on medical's handheld scanners
 2017-01-14 14:39:18 -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
Arokha Sieyes
6cf76748eb Fix language/EAL implant. 
Polaris added an item with the exact same path, hence the weird behavior of the EAL implant teaching you every language. Two items with the same path = weirdness. Should be better now.
 2017-01-14 02:32:02 -05:00
killer653
6f66241fe5 Better fix proposed by Aronai 2017-01-13 20:32:23 -05:00
Arokha Sieyes
7bb0b8fc5f Verin Fluff Coat 
Credit to Yosh for coding and providing the .diff for it. I just added a comment and put in the custom_items.txt change.
 2017-01-13 19:53:40 -05:00
killer653
21cb9d3746 Changes it to Aronai's more efficient way 2017-01-13 19:31:24 -05:00
killer653
6728441d5c Prevents accidental stomach flavor text deletion 2017-01-13 19:12:04 -05: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
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
Neerti
da34b5c8f0 Removes Last Minute Autoantag 
Autotraitor and other latespawning modes that may exist in the future should no longer spawn an antag if the shuttle's warming up or in transit.
It will also not spawn antags in the last 20 minutes of the round.  If the round gets extended due to a vote, it'll start again until the last 20 minutes of that hour.
 2017-01-11 23:21:38 -05: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
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
35d99b7caf Merge pull request #2908 from Neerti/1/9/2017_videocamera_port 
Ports Bay's Journalist TV Drone
 2017-01-10 22:20:12 -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