cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-12 15:42:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,250 Commits 66 Branches 25 Tags
Upstream-Sync
Commit Graph

20193 Commits

Author SHA1 Message Date
AnonymousHybi 3a26426ae3 okay im done 
it's a environment issue i think
 2018-03-21 16:23:54 +00:00
AnonymousHybi c45971bd00 BOT ATTEMPT 3 ELECTRIC BOOGALOO IM LOSING MY PATIENCE HELP 2018-03-21 15:14:48 +00:00
AnonymousHybi 5853881603 Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation 2018-03-21 14:50:33 +00:00
AnonymousHybi 67857af3de IRC bot attempt 2! Electric Boogaloo 2018-03-21 14:49:39 +00:00
ReddeyfishVor a6b0d3c8fa Merge pull request #46 from Cameron653/patch-1 
Fixes hide. Gives them the aphro bite by request
 2018-03-20 21:15:16 -07:00
ReddeyfishVor 8ac750476e Merge pull request #48 from Vulpias/patch-2 
Hotfix 1/2
 2018-03-20 21:15:06 -07:00
ReddeyfishVor a1cb9b25a8 Merge pull request #49 from Vulpias/patch-3 
Hotfix Succubus bite  2/2
 2018-03-20 21:13:02 -07:00
Sharkmare 09f05b81c2 Fix of the fix for test mob (#51) 
* Minor modifications to test mob

The lightbulb glows now!

* Refixed the Fix of the Fix for test mob

Break it down, build it up!
 2018-03-20 21:10:37 -07:00
Vulpias 13b7a63a54 Hotfix 2/2 
Should fix the poisons and make them last longer.
 2018-03-21 00:30:58 +01:00
Vulpias 3533b7fae0 Hotpatch 
this should fix the glitch where succubi bite doesn't show unless you have the succubus drain ability
 2018-03-21 00:26:54 +01:00
ReddeyfishVor 5632be3d74 Merge pull request #45 from Vulpias/patch-1 
Fixing one small typo
 2018-03-20 14:15:12 -07:00
Cameron653 1b8fcf6874 Fixes hide. Gives them the aphro bite by request 2018-03-20 17:06:36 -04:00
ReddeyfishVor 62f5986cb2 Merge pull request #44 from AnonymousHybi/master 
Enables IRC again...FFS...
 2018-03-20 13:53:18 -07:00
Vulpias 847ad90737 Fixing one small typo 2018-03-20 21:48:23 +01:00
AnonymousHybi d90ec29b5c Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation 2018-03-20 20:39:42 +00:00
AnonymousHybi 370c11d6de Enables IRC again...FFS... 2018-03-20 20:32:36 +00:00
Reddeyfish 1797178272 Add Erik's lungs as a fluff item in medical break room 2018-03-19 20:19:44 -07:00
ReddeyfishVor 9b64ef073e Merge pull request #41 from CHOMPstation/ReddeyfishVor-lunaShadekin 
Add Luna's custom shadekin
 2018-03-19 18:34:12 -07:00
Vulpias 37775035cf Adding two new Abilities for Succubus characters and the posibility of sitting on someones face (#40) 
* Add files via upload

* Delete station_special_abilities_vr.dm

* Update neutral.dm

* Update station_special_abilities_vr.dm

* Delete neutral.dm
 2018-03-19 18:28:44 -07:00
ReddeyfishVor 4270913ea5 Add Luna's custom shadekin 2018-03-19 18:11:36 -07:00
ReddeyfishVor 077e052275 Merge pull request #39 from Sharkmare/master 
Adding a custom mob shadekin
 2018-03-19 17:43:28 -07:00
Sharkmare f86dec074e Update types.dm 2018-03-19 19:40:13 +01:00
Sharkmare 1b9daeb39a Adding a custom mob shadekin 
Look, if you had one shot, one opportunity. To seize everything you ever wanted. One moment. Would you capture it or just let it slip?
 2018-03-19 19:23:13 +01:00
ReddeyfishVor 04190aae11 Add waiter uniform as an option in the loadout 
https://github.com/CHOMPstation/CHOMPstation/issues/31
 2018-03-18 10:19:18 -07:00
ReddeyfishVor f54a025064 Merge pull request #8 from ReddeyfishVor/ReddeyfishEventChanges 
Modify default active events.
 2018-03-17 12:14:11 -07:00
ReddeyfishVor ff65def1ff Merge pull request #26 from AnonymousHybi/master 
Some nice new vents and scrubbers and also an attempt at fixing the NIF runtime. Oh and syringes can't get dirty anymore.
 2018-03-17 12:13:34 -07:00
Reddeyfish edd6379d2d Increase solar wait duration, resolving incomplete initialization 
power grid was not always initialized before solars were
 2018-03-16 19:39:10 -07:00
AnonymousHybi f127317dad cleaned all syringes and coated them with anti-septic shite 2018-03-17 02:13:43 +00:00
AnonymousHybi 8d84532e6a attempt at fixing soul catcher nsay runtime 2018-03-16 01:20:41 +00:00
Jakksergal 456930807c A few map fixes. 2018-03-14 00:04:42 -07:00
CHOMPstation 0e30f7806e Merge pull request #13 from AnonymousHybi/master 
An attempt at fixing the travis error
 2018-03-13 21:28:53 -05:00
AnonymousHybi 5f2329b4ec Solved issue where updating sprite didn't check if it was a dogborg. 2018-03-13 21:20:16 +00:00
Reddeyfish 03f3d9b5c1 Merge branch 'virgoMaster' into virgoPull 2018-03-12 18:41:26 -07:00
Aronai Sieyes 8bc05d2a2e Merge pull request #3220 from VOREStation/aro-lwnerf 
Reduce lightweight trait point return
 2018-03-12 18:38:28 -04:00
Aronai Sieyes 23a50382e0 Merge pull request #3219 from VOREStation/aro-addedlogs 
Log additional engine information to game log
 2018-03-12 18:28:56 -04:00
Aronai Sieyes d70c8c48c3 Merge pull request #3218 from VOREStation/vplk-runtime-fixes 
Runtime Fixes - March
 2018-03-12 18:28:20 -04:00
Arokha Sieyes 2bea97d328 Reduce lightweight trait point return 2018-03-11 21:41:43 -04:00
Arokha Sieyes e4ec74af34 VS: Announce tes/singuloose in adminchat 2018-03-11 21:33:31 -04:00
Arokha Sieyes 82a0d86cf9 POLARIS: Log more engine info 2018-03-11 21:33:31 -04:00
Leshana f2fff2358b Fix DEBUG: Runtime in syringes_vr.dm,17: Cannot execute null.Cut() 2018-03-11 16:56:16 -04:00
Little-119 509474fcd6 Changes the shadekin empathy key from s to m, to fix sign language 2018-03-11 04:31:19 -04:00
Little-119 3e92f000f7 Fixes the cancel button in ears/wings/tail selection clearing the respective selection 2018-03-11 04:29:07 -04:00
Arokha Sieyes fae2b48eab POLARIS: Moves daily logs into being folders rather than files 2018-03-10 17:18:55 -05:00
Arokha Sieyes 46f4022852 VS: Consistent logging changes to match polaris commit 2018-03-10 17:18:09 -05:00
Arokha Sieyes 2c9bdf3ae4 POLARIS: Revamp logging to be consistent 2018-03-10 17:18:09 -05:00
Aronai Sieyes 54cf9636ec Merge pull request #3189 from Verkister/moreborgostuff 
Readies our borg stuff for next sync fixes.
 2018-03-10 15:01:04 -05:00
Konabird 19a4dc1dc7 Fixes Rischi's egg implant 2018-03-09 20:18:01 -06:00
Reddeyfish 8cd08fcf8d Modify default active events. 
Remove PDA spam from active events.
Add Space dust, supply request, containment breach to active events.
 2018-03-09 19:17:53 -07:00
Verkister e6ea9e3bda Merge branch 'master' into smvf 2018-03-09 22:17:57 +02:00
Aronai Sieyes 8ff288669d Merge pull request #3128 from aztectornado/hollow-bones 
Adds hollow bones trait
 2018-03-09 14:34:07 -05:00