cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-07 07:00:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,264 Commits 10 Branches 0 Tags
99fa945df9cc8a7f6efdecff8dbb487f03289f5a
Commit Graph

10667 Commits

Author SHA1 Message Date
Repede
9e43e721c6 Merge branch 'master' into YWPolarisVore_BorgAdditions 2019-12-29 21:19:41 -05:00
Hawk_v3
70711c03e1 Merge remote-tracking branch 'upstream/master' 2019-12-29 20:34:58 +00:00
Novacat
f2fb0d9f6a Merge pull request #6360 from Ketrai/sharksbranch 
Adds a new fish, measelsharks!
 2019-12-29 15:11:46 -05:00
Hawk_v3
a48b6f7cb2 Merge remote-tracking branch 'upstream/master' 2019-12-29 19:01:58 +00:00
Verkister
f5e02b9b23 Fixes chairs acting as handcuffs. (#6588) 
* Fixes chairs/beds/etc acting as handcuffs.

It's been at least 7 years without anyone noticing a broken feature with a false comment so the unintentional "balancing" caused by this may have ingrained a standard some folks would rather keep in, but that kind of nerfs have proper ways of implementing at their own appropriate places in the code.

Basically this just lets folks use hands when buckled. May also have a side effect of allowing self-surgery if it never had a proper prevention method implemented. Keeps an exception for xeno nests tho. Any other seat has no reason to be handcuffs.

* Fixes another thing causing chairs to incapacitate

"Are you seated" and "Are you incapacitated" should not be used as the same thing yet here we are.

I should probably also do a refactor to remove all the inappropriate use of canmove var. Seriously, even the specifically cartridge exclusive PDA menu buttons are using that for what???
 2019-12-29 02:42:50 -05:00
Repede
7eaa9e62e5 Merge branch 'master' into YWPolarisVore_BorgAdditions 2019-12-28 17:27:28 -05:00
Repede
3b360bb871 Merge branch 'master' into YWPolarisVore_BorgAdditions 2019-12-28 16:20:19 -05:00
Repede
2ef29bce49 Merge branch 'master' into YWPolarisVore_BPetting 2019-12-28 16:20:17 -05:00
Repede
b49e8bf7a6 Merge branch 'master' into YWPolarisVore_BorgAdditions 2019-12-28 12:43:29 -05:00
Repede
5c33de39c1 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore 
# Conflicts:
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	icons/mob/robots.dmi
 2019-12-28 12:00:22 -05:00
Ashvor
0281a7ed4f Merge branch 'master' of https://github.com/Ashvor/YWPolarisVore 2019-12-28 01:50:07 -07:00
Ashvor
369afed033 Quick edit 2019-12-28 01:46:52 -07:00
Repede
24a555a5fe Merge branch 'master' into master 2019-12-27 21:46:17 -05:00
Repede
9a6e385dea Merge branch 'master' into YWPolarisVore_BorgAdditions 2019-12-27 21:46:15 -05:00
Repede
8d5a064ed9 Merge branch 'master' into YWPolarisVore_BPetting 2019-12-27 21:46:12 -05:00
Ashvor
5851151319 New Borg Chassis 2019-12-27 17:37:36 -07:00
Repede
c89f65969b Fixes seromi grab loneliness, and access name changes 2019-12-27 19:05:32 -05:00
Holdelta
d674534825 Update robot.dm 2019-12-27 10:57:18 -08:00
Hawk-v3
6d30885523 Merge branch 'master' into YWPolarisVore_BPetting 2019-12-27 16:00:20 +00:00
Holdelta
39651a8d4f Update station_vr.dm 2019-12-27 03:49:14 -08:00
Holdelta
891c665c18 Update station_vr.dm 2019-12-27 03:39:25 -08:00
Holdelta
ec99fec1a6 Adding borg petting 
Adding borg petting, because its fun.
Help intent - Pets borg
Disarm intent - Taps borg
Grab intent - will do original functions(such as removing the battery when the panel is open)
Harm intent - Punches borg
 2019-12-27 01:14:10 -08:00
Repede
2af9f4ee44 Merge branch 'master' into master 2019-12-26 20:40:10 -05:00
Atermonera
d6b16dd09e Merge pull request #6585 from Verkister/patch-31 
Fixes gentle hairstyle missing
 2019-12-25 18:10:05 -05:00
Novacat
860566a1b6 Merge pull request #6350 from Verkister/tallboys 
Fixes resizing for icons taller than 32p
 2019-12-24 12:01:30 -05:00
Shadow
d4e45ee3b1 Adds the Booze Borg 2019-12-22 20:02:36 -06:00
Hawk_v3
5418d55495 Merge remote-tracking branch 'server/master' 2019-12-22 21:33:41 +00:00
Repede
ecb31d04e0 Merge branch 'master' into master 2019-12-22 11:51:38 -05:00
Ketrai
0e65a0b8a6 Adds sharks 2019-12-22 17:32:49 +01:00
Spades
e70816822b Merge pull request #6298 from Sebbe9123/dogborgpounce 
Buffs dogborg pounce
 2019-12-22 10:41:57 -05:00
Verkister
928bb57e7a almost forgot pais 2019-12-22 11:05:00 +02:00
Holdelta
a77f3e32e0 Merge branch 'master' of https://github.com/Holdelta/YWPolarisVore 2019-12-21 23:38:14 -08:00
Holdelta
1f0fbcf784 Adding Citadel RP dogborgs(Alternative Pupdozer model/Servicehound) #383 
Pure port of dogborgs, may add additional features later.

Additions:
-Vale Pupdozer model
-Servicehounds, four different options
 2019-12-21 23:29:09 -08:00
Repede
557bdfcb77 Merge branch 'master' into master 2019-12-22 02:02:55 -05:00
Holdelta
9adf79d862 Update station_vr.dm 2019-12-21 22:17:36 -08:00
Shadow
be37badee2 Ding Ding Dong 2019-12-22 00:17:16 -06:00
Holdelta
b96335bf10 Adding Citadel RP dogborgs(Alternative Pupdozer model/Servicehound) 
Pure port of dogborgs, may add additional features later.
 2019-12-21 21:23:37 -08:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Shadow-Quill
5476450579 Get less lonli! 2019-12-21 14:39:26 -06:00
Verkister
adc1eb2cf6 Fixes resizing for icons taller than 32p 
-Taller icons no longer sink into the tile below on the resize mechanics.
-Living mobs now have a var (vis_height) for their icon height, and humanmob species have a new var (icon_height) that overrides the vis_height for the resize proc.
-Also earlyports some tweaks to ambient occlusion. The new filter system took the old filter's settings as "make the shadows megathick and dummy intense" and that was ugly.
 2019-12-21 18:35:45 +02:00
Shadow
ff0ff96a84 Teshari Fix Fixed! 2019-12-21 02:17:25 -06:00
Shadow
3f4e0a7840 No Scare 2019-12-21 01:16:33 -06:00
Sebbe
a2a19321c9 Ace changes 2019-12-20 10:31:17 +01:00
Meghan-Rossi
6530bc2e9f Merge remote-tracking branch 'origin/master' into prybars 2019-12-19 20:52:03 +00:00
Novacat
0432002af7 Merge pull request #6327 from VOREStation/upstream-merge-6558 
[MIRROR] Change various global species lists to GLOB versions, adds 2 more event subspecies.
 2019-12-19 15:46:59 -05:00
TheFurryFeline
82e5064e11 Mimic Grammar. 
Fixes extra "the"'s.
 2019-12-19 13:57:35 -05:00
Meghan-Rossi
f59e2811e3 Merge branch 'upstream-merge-6520' into prybars 2019-12-19 18:47:49 +00:00
Meghan-Rossi
604fd1b74f Resolve conflicts, fix compile errors 2019-12-19 17:49:21 +00:00
RadiantFlash7
0d40994226 Fixes galore & New away mission 
Beach Away mission is Now Whiskey Station Mission.

Fixes a large number of bugs from github (Help me pls)
 2019-12-16 23:12:56 -05:00
Sebbe
ec76f31285 Adjusts to 90%. adds 2 seconds of stun as suggested. 2019-12-16 09:52:20 +01:00