cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,453 Commits 8 Branches 0 Tags
f656dd6dfb6f67e81cb155535f0e26af6b6c58f3
Commit Graph

2498 Commits

Author SHA1 Message Date
ZekeSulastin
84f161a6f2 Fixes pregame loop with no readied players (#6814) 
When the config option for pregame time was added in #6795, the
pregame_timeleft setting was moved out of the do while !setup loop.
If the game does not set up, it would keep decrementing the counter
into the negatives since it was never reset.
 2020-03-11 01:36:01 -04:00
Aronai Sieyes
72f239b2ac Makes pregame time a config setting 
Boo hardcoded values
 2020-03-08 01:05:28 -04:00
Aronai Sieyes
f475ecbdc6 Replace a bunch of VOREStation edits that can be sent to Polaris 2020-02-29 19:45:58 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
TheFurryFeline
dc0c513086 Changeling Item Name/Desc Fixy (#6624) 
* Changeling Name/Desc Fixy

Minor var fixes for the changeling combat boots variation. Apparently name and desc were flipped around, resulting in abnormal name output when removed from a dead Beta Replicant.

* Changelog
 2020-01-16 02:56:14 -05:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Anewbe
12d5118ecc Merge pull request #6550 from listerla/grammar-time 
Fixes two typos (rengeration and Extranneous)
 2019-11-29 19:49:14 -05:00
Mechoid
99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Atermonera
a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05:00
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Atermonera
1b21bb3d15 Merge pull request #6497 from parasitoide/master 
Compatable -> Compatible
 2019-10-27 16:21:16 -04:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Heroman
c92960feca Some post-release fixes 2019-09-15 06:27:32 +10:00
Heroman
78d3f43b10 Emergency fixes 2019-08-20 07:56:11 +10:00
Heroman
6e8f35d80d Fixes roundstart runtime 2019-08-19 10:10:54 +10:00
Heroman
b2f3cc9bb5 Fixes borgs showing up in manifest in Misc category if they spawned roundstart 2019-08-18 09:37:17 +10:00
Andrew
e4deaa6478 Combat Mechs Can Punch More Things (#6303) 
* Combat Mechs Can Punch More Things

Removes the var to check for the 5 things it can attack, instead it can punch anything (but not everything will take damage).

Gives punching objects a check so you don't accidently smash something without meaning to.

Gives closets and canisters a proc to take_damage so they'll actually get smashed by the mechs.

* Take_Damage Boogaloo

* More take_damage Stuff

Adds click delay on attacking barriers.
Proper noises when attacking material doors and barricades.

More stuff can be broken by mech punch and simple mobs.

* Adds changelong

* usr to user
 2019-07-24 17:00:24 -04:00
Heroman
bf352acb09 A stray attempt at fixing the lacking manifest entries 2019-07-23 11:16:30 +10:00
Anewbe
337315c6de Merge pull request #6242 from Nalarac/patch-4 
Adds Arcane Tech to Cult Items
 2019-07-07 17:17:53 -04:00
Mechoid
595cdeb7b5 THIS PR IS 7+ DAYS OLD, SEE #6203 . Energy-Swords and Changeling Melee Weapons Can Deflect Projectiles (#6215) 
* MakeMeleeGreatAgain

* Where is melee defined?!
 2019-06-18 05:51:23 -04:00
Neerti
f830985d38 Merge pull request #6072 from Mechoid/Start_Conversion_To_Good_RNG 
[RNG is the new RNG] Converts a bunch of events to the Game Master datum system.
 2019-05-13 22:57:23 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Heroman
703c27da7e Refactors shadekin 2019-04-28 15:10:06 +10:00
Neerti
c054354fb0 Merge pull request #6130 from Heroman3003/gamemode-fixes 
Fixes gamemode checking list itself, instead of entries
 2019-04-23 05:21:19 -04:00
Atermonera
6cb44efd10 Merge pull request #6114 from Neerti/gamemode_config 
Makes gamemode player requirements be able to be overridden in the config
 2019-04-22 14:33:38 -04:00
Novacat
2c07c85138 Adds New Alert Levels (#6019) 
* Adds New Alert Levels
 2019-03-30 18:29:12 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Anewbe
8ed384b38c Rewrites Atmospherics 2019-03-28 19:25:11 -04:00
Novacat
a4919caba2 Merge pull request #4719 from VOREStation/upstream-merge-5636 
[MIRROR] [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work
 2019-03-28 14:52:51 -04:00
Novacat
3a0dbf687b Merge pull request #4720 from VOREStation/upstream-merge-5896 
[MIRROR] Changeling & Straight Jacket modifications.
 2019-03-28 14:35:51 -04:00
Neerti
3256202407 [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work 2019-03-27 22:02:07 -04:00
Novacat
dce3466f3b Merge pull request #4684 from VOREStation/upstream-merge-5814 
[MIRROR] [READY]Makes a bunch of processes subsystems instead
 2019-03-27 17:46:31 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Neerti
7dd1c94be2 Merge pull request #5851 from Mechoid/Fix_Techno 
Fix Technomancer Refunding
 2019-03-27 15:53:03 -04:00
Novacat
696872690e Merge pull request #4677 from VOREStation/upstream-merge-5776 
[MIRROR] Adds pressure protection bounds to clothing.
 2019-03-27 15:18:17 -04:00
Novacat
b176b056e0 Merge pull request #4655 from VOREStation/upstream-merge-5793 
[MIRROR] Upgrades SDQL2 and refactors it to a datum
 2019-03-27 13:52:08 -04:00
Neerti
9d46150515 Adds pressure protection bounds to clothing. 2019-03-27 13:26:07 -04:00
kevinz000
dfbd0bd72b Upgrades SDQL2 and refactors it to a datum 2019-03-27 11:50:49 -04:00
Spades
eb0e2ec1f5 Guns sounds refactor and improvements 2019-03-27 10:42:18 -04:00
Anewbe
09b01407e3 Adds Various Sounds, Looping Sound System 2019-03-27 03:55:21 -04:00
Neerti
585b688709 Adds Identification System, New Autoinjectors 2019-03-27 02:25:55 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Atermonera
4a12e63534 Merge pull request #5896 from Mechoid/A_Tale_Of_Jackets_And_Changelings 
Changeling & Straight Jacket modifications.
 2019-01-26 14:12:47 -05:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Spades
1338225afa Resolves some merge conflicts 2019-01-05 16:29:19 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Arokha Sieyes
30a8a3ce31 VS edit merges 2018-10-20 17:37:08 -04:00
Neerti
3a9c13b937 Ports Vote to SMC 2018-10-20 01:53:13 -04:00