cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,673 Commits 7 Branches 0 Tags
e20f05e1884d538410c1d9a6ecb75dcc47047a1c
Commit Graph

21569 Commits

Author SHA1 Message Date
Spades
6f35a33e1c Merge pull request #4068 from VOREStation/upstream-merge-5429 
[MIRROR] Adds Marking Order Changing at Character Creation
 2018-08-17 16:07:33 -04:00
Spades
6a95420bf9 Merge pull request #4064 from VOREStation/upstream-merge-5426 
[MIRROR] Fixes a few bugs associated with the Dead Ringer
 2018-08-17 16:07:16 -04:00
Spades
bf98b4238d Merge pull request #4063 from VOREStation/upstream-merge-5425 
[MIRROR] Adds an indent formatting tag to paper
 2018-08-17 16:06:56 -04:00
Spades
ddba78b5a8 Merge pull request #4062 from VOREStation/upstream-merge-5428 
[MIRROR] Fixes anomaly suits being invisible. For real this time.
 2018-08-17 16:06:44 -04:00
Spades
7ace233760 Merge pull request #4105 from ArgobargSoup/master 
Cosmetic tweaks for catgirls.
 2018-08-17 16:06:22 -04:00
Spades
7bec3f26aa Merge pull request #4152 from VOREStation/upstream-merge-5487 
[MIRROR] PENGUINS ARE FROM EARTH
 2018-08-17 16:06:02 -04:00
Spades
db804f02ee Merge pull request #4061 from VOREStation/upstream-merge-5423 
[MIRROR] Implements ways to make floors not get dirty
 2018-08-16 05:44:19 -04:00
Atermonera
f24cc0ab39 Merge pull request #5499 from Anewbe/reagent_ring_fix 
Fixes the Sleepy Ring
 2018-08-15 21:19:04 -07:00
Atermonera
1e6cc18942 Merge pull request #5497 from Anewbe/smoother_movement 
May or may not make movement seem smoother
 2018-08-15 21:18:48 -07:00
Atermonera
e050f4c789 Merge pull request #5496 from Anewbe/supermatter_grenade 
Ports the supermatter grenade, supporting code
 2018-08-15 21:17:26 -07:00
Atermonera
5819840d8b Merge pull request #5495 from Anewbe/drinking_problem 
Drinking more booze gets you drunk faster
 2018-08-15 21:12:20 -07:00
Atermonera
a2e5894655 Merge pull request #5490 from Anewbe/drug_effects_redux 
The speed-related chem effects are no longer a one-or-none affair, oxy causes slowdown
 2018-08-15 21:04:50 -07:00
Spades
6919cca96d Merge pull request #4070 from Knightfall5/master 
Ashley's fluff item
 2018-08-15 18:36:28 -04:00
deathride58
87859c77af adds a pref to enable/disable showing up in the character directory 2018-08-15 06:18:58 -04:00
Anewbe
e1471886d8 Fixes the bug(s) that allow meat bodies to have metal brains 2018-08-14 23:12:43 -05:00
Anewbe
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Verkister
85a7c2d7d4 snip 2018-08-14 09:16:42 +03:00
Verkister
6cb51f741a Merge branch 'master' into synthmarking 2018-08-14 09:09:14 +03:00
Anewbe
6065a8d496 Fixes the Sleepy Ring 2018-08-13 20:24:23 -05:00
Mewchild
d01488a1cd Reverts Syringe infections 2018-08-13 10:53:02 -05:00
Spades
84a3d824de Merge pull request #3885 from Cameron653/ALRAUNE_STUFF 
Alraune abilities and minor code changes
 2018-08-13 07:50:23 -04:00
Spades
ed06781743 Merge pull request #3759 from Verkister/belletweakins 
Dogborg equipment/belly tweaks and fixes. (Ready)
 2018-08-13 07:49:55 -04:00
Anewbe
2eafa13c96 Merge pull request #5494 from Neerti/weather_refactor 
Refactors Weather
 2018-08-12 19:39:18 -05:00
Anewbe
cff73a6ad8 May or may not make movement seem smoother 2018-08-11 23:15:06 -05:00
Anewbe
8f42127837 Ports the supermatter grenade, supporting code 2018-08-11 20:10:05 -05:00
Anewbe
c9e64af771 Drinking more booze gets you drunk faster 2018-08-11 18:46:15 -05:00
Neerti
3b5874d3f1 Weather refactor. 2018-08-11 18:42:36 -04:00
Anewbe
99bc87e829 Wind in storms slightly nerfed 2018-08-10 22:20:13 -05:00
Anewbe
c5d0559477 Slightly cleans up hooded suit code (#5471) 2018-08-09 20:47:50 -07:00
kcin2001
187fc62e9c Adds new job/department specific teshari clothing to the loadout (#5481) 
* adding the new department specific teshari outfits
 2018-08-09 19:43:40 -07:00
Anewbe
1d44e34e85 Merge pull request #5487 from elgeonmb/patch-8 
PENGUINS ARE FROM EARTH
 2018-08-09 15:55:00 -04:00
Anewbe
1e0494caaf Merge pull request #5487 from elgeonmb/patch-8 
PENGUINS ARE FROM EARTH
 2018-08-09 14:53:58 -05:00
Atermonera
88e7708dee Merge pull request #5482 from Mechoid/End_The_Tyranny_Of_PunPun 
Hallucinations now use the old system again.
 2018-08-08 20:38:29 -07:00
elgeonmb
2eb03219f4 penguins are from earth 
capitalize this, anewbe, i dare you
 2018-08-08 00:49:27 -07:00
Atermonera
bb575f0d53 Merge pull request #5468 from Anewbe/is_tool 
Hopefully Unnoticeable Tool Refactor
 2018-08-07 22:06:20 -07:00
Atermonera
1f7702a6de Merge pull request #5477 from kartagrafi/hairr 
Adds new hairstyles
 2018-08-06 15:41:29 -07:00
Atermonera
db16e11e3e Merge pull request #5474 from Anewbe/open_space 
MultiZ falling tweaks
 2018-08-06 15:38:21 -07:00
Atermonera
92a104860e Merge pull request #5473 from Anewbe/dirt_part_two 
Various things and floors no longer associate with dirt
 2018-08-06 15:37:06 -07:00
Anewbe
eba2257195 Corrects noted issues 2018-08-06 13:15:18 -05:00
Anewbe
02084177fb The speed-related chem effects are no longer a one-or-none affair, oxy causes slowdown 2018-08-06 12:16:40 -05:00
Neerti
3de28fa6b2 Ambience Refactor (#5476) 
* Refactors how ambience is assigned, removes bad ambience, ports good ambience from tg

* Apparently that file is still used, not worth the salt to remove it.

* Changelog
 2018-08-06 11:12:17 -05:00
Mechoid
c9ef8f1fef Hallucinations now use the old system again, but with the more modern components. 2018-08-06 00:58:29 -07:00
Anewbe
1b57722d22 Fixes spelling of Strike in Lightning Strike admin verb 2018-08-05 14:05:03 -05:00
tex
6f0dbfc750 Added new hairstyles 2018-08-05 20:55:19 +02:00
Anewbe
a13783945f MultiZ falling tweaks 2018-08-04 23:32:04 -05:00
Anewbe
73a3417f5d Various things and floors no longer associate with dirt 2018-08-04 22:41:58 -05:00
Anewbe
5c35b9f284 Forces mech construction to work with the is_tool() procs 2018-08-04 20:42:53 -05:00
Anewbe
f1507ebfa2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-04 11:20:02 -05:00
Neerti
6ffd299fd7 Merge pull request #5461 from Atermonera/supply_nanoUI 
Refactors supply controller
 2018-08-04 02:55:15 -04:00
Anewbe
b88b70eb61 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-03 19:53:06 -05:00