cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,857 Commits 5 Branches 0 Tags
b5cf8383f66034e4808e416ca37e5b18a4588ca5
Commit Graph

20586 Commits

Author SHA1 Message Date
Leshana
b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14 
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
 2018-04-15 14:19:36 -04:00
HzDonut
700c902d14 Modified LeMat Fluff Weapon (#3337) 
* LeMat

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm
 2018-04-14 19:41:19 -04:00
Spades
8f7015d409 Lore updates (#3430) 
* Lore-updates

This PR is entirely stuff to update in-game content to match lore on the
wiki.

I haven't decided if it's done or not.

* Let's first make it actually work

* Fixes a few things, also adds ONI

* [screams in feeling]

* Fixes some lore shit
 2018-04-14 12:58:42 -04:00
Aronai Sieyes
2e0c271ac2 Merge pull request #3458 from VOREStation/aro-3457 
Probably fixes #3457 - Paper plane creation weirdness with paper
 2018-04-14 12:57:57 -04:00
Aronai Sieyes
5d8f970d02 Merge pull request #3462 from VOREStation/aro-protbuckle 
Fix a few Protean bugs
 2018-04-14 12:56:30 -04:00
Aronai Sieyes
eb49e34378 Merge pull request #3456 from VOREStation/aro-vpfix 
Let's not add 'DM_TRANSFORM' once per time you've opened the vp
 2018-04-14 12:53:24 -04:00
Arokha Sieyes
84bbfcc787 Fix infinite loop of metal usage due to mismatch in values 2018-04-14 12:20:50 -04:00
Arokha Sieyes
be50f394a6 Transforming to/from protean blob unbuckles riders 2018-04-14 11:12:46 -04:00
Arokha Sieyes
4d80cd8df5 Proteans unbuckle targets before blobbing them 2018-04-13 21:08:06 -04:00
Arokha Sieyes
e9009507d8 Remove Aronai custom bag 
Medical bags ARE blue now, I don't need a custom blue one, just the ID that came in it.
 2018-04-13 20:21:25 -04:00
Arokha Sieyes
ee73a9d519 Probably fixes #3457 - Paper plane creation weirdness with paper 2018-04-13 11:51:25 -04:00
Arokha Sieyes
c2c3b08db6 Let's not add 'DM_TRANSFORM' once per time you've opened the vore panel, okay 2018-04-13 11:29:49 -04:00
Neerti
f80fe6a1c9 Optimizes Powercell Update Icons 2018-04-12 18:53:47 -04:00
Heroman3003
1ff2f26889 Fixed legcuffs checking for being handcuffed instead of legcuffed when put on 2018-04-13 05:00:18 +10:00
Aronai Sieyes
791b5a4155 Merge pull request #3387 from KasparoVy/small_raptor_big_problem 
Fix Teshari Tail-hair Rendering
 2018-04-12 12:03:58 -04:00
Aronai Sieyes
b08f0db2bb Merge pull request #3406 from Cameron653/SILENCEDMP5A5_FLUFF 
Adds SilencedMP5A5's fluff items
 2018-04-12 12:01:42 -04:00
Aronai Sieyes
b46816f01d Merge pull request #3436 from Verkister/patch-13 
Nerfs apex metabolism
 2018-04-12 11:52:10 -04:00
Aronai Sieyes
298def0af5 Merge pull request #3438 from Verkister/dur 
Adds deer taur.
 2018-04-12 11:51:42 -04:00
Aronai Sieyes
8afd5cad9a Merge pull request #3441 from Verkister/rous 
Adds giant rat voremob.
 2018-04-12 11:51:29 -04:00
Aronai Sieyes
ae4c5a0d95 Merge pull request #3443 from VOREStation/aro-digestaddons 
Adds 'mode addons' feature to bellies to replace several modes
 2018-04-12 11:51:15 -04:00
Arokha Sieyes
474bb3c8c8 Couple more Protean fixes, + darksight 
Fixes a blob transform check. Also they get a smidge of darksight (the minor trait). I'm sure they have expensive sensors, but giving them the taj darksight seems meh.
 2018-04-11 20:55:54 -04:00
Arokha Sieyes
4c604fb8da Adds 'mode addons' to bellies to replace several modes 2018-04-11 19:22:20 -04:00
Verkister
14ad23f8e6 mouse 2018-04-11 22:34:44 +03:00
Aronai Sieyes
b427bca859 Merge pull request #3423 from Verkister/newvoreagain 
Some vore tweaks. (new gurglemodes will hopefully be back in another PR)
 2018-04-11 14:37:20 -04:00
Verkister
2dec2545e5 Adds giant rat voremob. 
-Currently only available via pred crate/shenanigans.
-This dude is friends with regular mice but will gladly kick any other ass.
 2018-04-11 20:44:53 +03:00
Aronai Sieyes
2f04ff30cb Merge pull request #3433 from VOREStation/aro-protwork 
Fix another protean bug (resizing message)
 2018-04-11 10:23:44 -04:00
Verkister
9f21628619 Adds deer taur. 
-Adds dual color deer taur.
-Sort of fits the lizardtaur saddlebag gear as well so I lazily made it accept the deer too for now.
 2018-04-11 17:14:21 +03:00
Verkister
4d40702f3e Nerfs apex metabolism 
Now it's like more consistent with the steps between other modes.
 2018-04-11 09:08:39 +03:00
Cameron653
b3efd60a72 Merge branch 'master' into SILENCEDMP5A5_FLUFF 2018-04-11 00:37:26 -04:00
Arokha Sieyes
3776c21563 Fix another protean bug (resizing message) 2018-04-10 22:16:36 -04:00
KasparoVy
58251baa3a Fix Teshari Tail-hair Rendering 
Add the '_s' suffix to the icon state in the tail hair stage of tail icon generation.
This fixes an issue where Teshari tail hair wasn't rendering.

Also amends the colouration (was necessary for this to work for us) since VOREStation uses multiplicative blending
 2018-04-10 20:06:53 -04:00
Neerti
228e37e923 Optimizes Powercell Update Icons 2018-04-10 19:58:09 -04:00
Verkister
d8efac9cb0 dunno 2018-04-11 01:23:44 +03:00
Aronai Sieyes
dc7cefdd0d Merge pull request #3421 from VOREStation/aro-protwork 
Some protean fixes (regen, size as blob, gender)
 2018-04-10 18:19:32 -04:00
Arokha Sieyes
82c05428e1 Some protean fixes (regen, size as blob, gender) 2018-04-10 18:10:14 -04:00
Aronai Sieyes
1b5e92329d Merge pull request #3420 from VOREStation/aro-fixscpersist 
Set appropriate vars for persisting adminspawned characters
 2018-04-10 18:04:29 -04:00
Anewbe
3ae8bcd563 Merge pull request #5157 from elgeonmb/Apr08NewsUpdate 
yet another lore update
 2018-04-10 15:32:41 -05:00
Verkister
ee0224d794 Removes some changes, clarifies ID description 2018-04-10 23:03:18 +03:00
Spades
24217b12a8 Merge pull request #3389 from Verkister/mobvors 
Fixes resting and vore icon issues with mobs and silicons
 2018-04-10 14:44:36 -04:00
Aronai Sieyes
0e62b4a159 Merge pull request #3413 from VOREStation/aro-telenompref 
Fixes #3368 - Teleporting now often respects dropnom pref
 2018-04-10 12:51:26 -04:00
Verkister
6b535efd27 Adds some new gurglemodes and other tweaks 
-Adds numbing item friendly gurglemode.
-Adds item friendly strip digestion. (still soggy though)
-Adds strip absorption. (absorb naked victim, leave their stuff in gut)
-Makes absorption mute the drained absorbee's hunger noises if enabled.
-Makes draining and absorption speeds scale with gurgledamage settings.
-Also makes them affect borg charges.
-Disables item friendly gurgles completely ruining IDs, the likely most important item the prey wants spared when suggesting the mode. (still messy though)
-Makes borg sleeperbelly sounds use the new pref-respecting noise system.
-Adds a finisher gurgle and ding sound to finished self-clean cycle.
 2018-04-10 10:00:35 +03:00
Anewbe
80e382af28 Merge pull request #5158 from elgeonmb/patch-4 
Polar-izes shipping locations
 2018-04-09 22:42:26 -05:00
Arokha Sieyes
63d53a054f Set appropriate vars for persisting adminspawned characters 2018-04-09 20:47:44 -04:00
Anewbe
8c23ec4844 Merge pull request #5153 from Neerti/4/5/2018_tile_attacking 
Adds Tile-based Attacks
 2018-04-09 19:16:58 -05:00
Verkister
5e0ed0585f done 2018-04-09 23:40:20 +03:00
Leshana
98d5f62250 Merge pull request #3400 from VOREStation/polaris-sync-2018-04-04 
Polaris Sync 2018-04-04
 2018-04-09 13:28:19 -04:00
Leshana
a2b40e5aef Merge pull request #3411 from Heroman3003/meson-overlay-fix 
Fixed mesons NIFSoft overlay not highlighting open spaces above
 2018-04-09 07:23:14 -04:00
Arokha Sieyes
d67f433f22 Fixes #3344 - Holocarp set DM_HOLD when holodeck is safe 2018-04-08 22:00:10 -04:00
Arokha Sieyes
44437da3c3 Fixes #3368 - Teleporting now often respects dropnom pref 2018-04-08 21:42:33 -04:00
Cameron653
1b447796de Moves to proper file 2018-04-08 21:05:47 -04:00