cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 06:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,349 Commits 7 Branches 0 Tags
5f8ce48793a3e8220224f60b98b51df7bb9b10c0
Commit Graph

10705 Commits

Author SHA1 Message Date
Atermonera
8986eb7720 Merge pull request #6902 from VOREStation/vplk-ssalarm 
Convert alarm_manager into SSalarm subsystem.
 2020-03-30 20:41:10 -04:00
Aronai Sieyes
b78cdf7b64 Merge pull request #7026 from ShadowLarkens/admin_utilities_and_niceities 
Added three utilities for admins & developers
 2020-03-27 22:30:21 -04:00
ShadowLarkens
c44553c9d5 Added three utilities for admins & developers 
- There is a new option in the player panel labeled "Send back to
   Lobby", which will send a given player back to the lobby.
 - The player panel also has a shortcut to the "Spawn Character" verb.
 - Finally, there's a new config option that disables the warning
   message about multikeying if two mobs with the same CID are found;
   this option should NOT be enabled if multikeying is prohibited by the
   server rules. It is simply a developer tool, as multikeying is
   sometimes necessary to test new features that require two clients
   interacting.
 2020-03-27 15:41:44 -07:00
TheFurryFeline
1045a56bb3 Look, Ma! More Typo Fixing! 
Title, Affectionally -> Affectionately

Changelog Notes:

- Fixes borgs' licking adjective's, or whatever's, spelling.
 2020-03-27 18:33:21 -04:00
Aronai Sieyes
aef2081f46 Merge pull request #7005 from VOREStation/aro-fix6332 
Emote noise toggle
 2020-03-26 16:00:34 -04:00
Aronai Sieyes
556ef6acc8 Emote noise toggle 2020-03-26 11:43:26 -04:00
Aronai Sieyes
e618f8d16d Redo morph TF code 2020-03-26 11:20:50 -04:00
Atermonera
8e5e83c2b5 Prometheans can be slipped again (#6898) 
* Prometheans can be slipped again

* Update human_attackhand.dm
 2020-03-25 20:59:57 -04:00
Novacat
f9bfa6e56d Merge pull request #6987 from Novacat/nova-basicfixes 
Fixes lurkers having super cloak
 2020-03-25 16:53:51 -04:00
Atermonera
baf867e93d Besrserkjuice doesn't spam chat (#6893) 2020-03-25 16:37:53 -04:00
Unknown
a60d494a70 Fixes lurkers having super cloak 2020-03-25 16:02:38 -04:00
Atermonera
4384ca1727 Xenoarch Expansion 2020-03-24 21:43:27 -04:00
Novacat
b6e26ea163 Merge pull request #6953 from TheFurryFeline/TFF-Attack_Verb_Grammar_Fixy_Again 
[Oversight] Mob Attacktext Fixy
 2020-03-24 16:34:39 -04:00
Aronai Sieyes
9917826c85 Merge pull request #6965 from VOREStation/aro-fighters 
Creates 2 new mech equipments and space fighters
 2020-03-24 14:04:42 -04:00
Novacat
4b2b3b3a2f Merge branch 'master' into upstream-merge-6882 2020-03-23 23:25:26 -04:00
Novacat
94f5eda84c Merge pull request #6967 from VOREStation/upstream-merge-6881 
[MIRROR] Add mob/living stat setter and observer
 2020-03-23 23:25:02 -04:00
Atermonera
cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
Atermonera
87333d9c25 Add mob/living stat setter and observer 2020-03-23 22:47:44 -04:00
Atermonera
1873a3a870 Merge pull request #6880 from Greenjoe12345/teshariprosthetics 
Teshari prosthetics
 2020-03-23 22:38:13 -04:00
Aronai Sieyes
c93c5afefa Adds atom/movable cloaking framework 2020-03-23 21:34:32 -04:00
Novacat
ba571acffc Merge branch 'master' into TFF-Attack_Verb_Grammar_Fixy_Again 2020-03-23 18:52:43 -04:00
Aronai Sieyes
61bbf89144 Fix line endings 2020-03-23 10:37:19 -04:00
Atermonera
358d35b2aa [Oversight] Yay, another typo fixy 2020-03-23 02:34:24 -04:00
TheFurryFeline
5c8ac8ccd1 Bitten to Bit 
Sync with Polaris version per review.
 2020-03-23 00:35:22 -04:00
TheFurryFeline
69032e3ec0 Horror Mob Attacktext Fixy 
Title, Sif Mob attacktext fixes ported to active Polaris PR: https://github.com/PolarisSS13/Polaris/pull/6875

Changelog Nots:

- Fixes verb tense and spelling for all horror,  vore, Sif, and birb subtype mobs.
 2020-03-22 13:27:58 -04:00
Novacat
6c52239b6c Merge pull request #6947 from VOREStation/aro-combatdrone 
Combat drone sprite
 2020-03-22 09:17:42 -04:00
Runa Dacino
99b7377c5e Unwhitelists solcom 
Shouldn't be a whitelisted language, for some reason it was removed from vr exceptions. Readded.
 2020-03-22 05:36:54 +01:00
Aronai Sieyes
033e64f3c9 Combat drone sprite 2020-03-21 21:20:50 -04:00
Aronai Sieyes
4aaff0704e Merge pull request #6925 from ShadowLarkens/vore_cleanup_less_cursed_maybe 
Cleanup vore code
 2020-03-21 00:52:46 -04:00
Unknown
80e5344901 Fixes Fennec/Xenohybrid hairstyles 2020-03-20 20:44:41 -04:00
Atermonera
d397c2c1fe Merge pull request #6840 from Neerti/qol_notification_sounds 
QoL: Various Notifications
 2020-03-20 15:09:47 -04:00
Unknown
db87175163 Earlyport Fixes 2020-03-20 13:50:44 -04:00
Unknown
a40df7dda7 Earlyports some bugfixes 2020-03-20 00:35:55 -04:00
ShadowLarkens
d5d5385b76 Cleanup vore code 2020-03-19 21:17:24 -07:00
Leshana
f2a582569b Ports overmap events from Baystation12 
- Move overmap defines to _defines folder.  Rename old file to turfs.dm since that is what it contains.
- Definition of overmap event objects and the overmap event handler.
- Upgrades to SSevents and SSskybox to tie in the overmap events.
- Enhancement to /datum/event itself to support affecting_z and victim ship.
- Upgrade to the five event types used on the overmap to support new vars.
- Upgrade to dust and meteor spawning code to support targeting z-levels.
 2020-03-19 20:29:43 -04:00
Novacat
4cd077019f Merge pull request #6683 from Novacat/nova-heterochromia 
Species consolidation
 2020-03-19 18:55:54 -04:00
Aronai Sieyes
935b2baca5 Merge pull request #6914 from VOREStation/aro-mapload 
Speed up map load significantly
 2020-03-19 18:20:51 -04:00
Amaya
ea7db54500 Adds a single event mob. 
This mob will be very useful in events that I will be making.
Includes folder for non-Vore sprites (imported from TGstation)
 2020-03-19 14:12:36 +01:00
ShadowLarkens
2e23dcdb49 Speed up mapload significantly 
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
 2020-03-19 00:29:24 -04:00
Unknown
c960a9ec30 Finishes this PR 2020-03-17 14:00:02 -04:00
Unknown
a6a12b3a9e Merge remote-tracking branch 'VOREStation/master' into nova-heterochromia 2020-03-17 13:16:11 -04:00
Novacat
e19a1fd2b9 Merge pull request #6892 from VOREStation/upstream-merge-6819 
[MIRROR] Makes language keys case sensitive, adds unit tests for language conflicts, fixes some language conflicts
 2020-03-17 01:40:47 -04:00
Unknown
a0d1e784c7 More duplicates 2020-03-17 01:25:43 -04:00
Novacat
fb33bde693 Merge pull request #6896 from VOREStation/upstream-merge-6834 
[MIRROR] Fix various RIG issues
 2020-03-17 01:15:18 -04:00
Unknown
62e6874e9b Fixes duplicate language keys 2020-03-17 01:12:31 -04:00
Atermonera
cd10c54d5c Merge pull request #6834 from Mechoid/RIGFixes 
Fix various RIG issues
 2020-03-17 01:06:31 -04:00
Atermonera
101c9c33c5 QoL: Projectiles 2020-03-17 00:55:56 -04:00
Novacat
6ff1e6231b Merge pull request #6894 from VOREStation/upstream-merge-6825 
[MIRROR] Shock modification
 2020-03-17 00:50:00 -04:00
Atermonera
66271e7a91 Merge pull request #6825 from Jamini/Jamini-patch-1 
Shock modification
 2020-03-17 00:38:07 -04:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00