Commit Graph

115 Commits

Author SHA1 Message Date
Arokha Sieyes
e248b89b7b POLARIS: Player-controlled SA QOL 2018-02-15 01:49:53 -06:00
Neerti
96d3d361d0 Adds Boats, Ports /TG/ Buckling (#4527)
* Adds Boats, Ports /TG/ Buckling

* Travis Appeasement

* Changelog
2018-01-14 14:58:15 -06:00
Neerti
fe32372f74 Adds Directional Shields
Implements shields which block projectiles from outside, but allow projectiles to leave from inside.
Also adds a projector item which makes these, in two variants, rectangle and line.  It was made an item so that down the road making stationary/wearable/etc versions will be easier as they can just contain the item.
Currently there is no way to obtain this without adminspawn.  I have Future Plans(tm) for these.
2017-09-28 14:06:07 -04:00
Anewbe
4b2e4eeca7 Improves catwalks and railings 2017-09-23 20:43:51 -05:00
Cameron653
e158fcd3cc Macro Replacements. (#3574)
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Neerti
d6683be3ce Adjusts Changelings
See PR
2017-04-23 13:22:32 -04:00
Anewbe
a8aa9d1cfa Tweaks walking speed 2016-12-08 21:26:37 -06:00
HarpyEagle
6b7d40b75f Fixes confused movement for walking/running, adjusts behaviour 2016-04-20 16:49:33 +02:00
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Zuhayr
a5227c9904 Merge pull request #698 from Hubblenaut/master
Changes to Confused Moving
2016-01-08 00:52:35 +10:30
Hubblenaut
61e31ab8ad Wheelchair fixes 2016-01-05 00:56:57 +01:00
Hubblenaut
75c78fc3c9 Changes to Confused Moving 2015-12-31 02:28:35 +01:00
Zuhayr
0148e78eda Removed targeting. 2015-12-16 10:25:18 +10:30
PsiOmegaDelta
5fcf13ac55 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/surgery_limbattachment.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
2015-12-08 08:09:37 +01:00
mwerezak
9135a609cb Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468 2015-12-06 04:17:52 -05:00
PsiOmega
5863112d2d Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
2015-09-15 20:31:59 +02:00
PsiOmega
5c1b8380a4 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tanks.dm
2015-09-15 20:25:13 +02:00
PsiOmegaDelta
bb5680193f Converts some loc = to forceMove()
Fixes #11102.
2015-09-14 11:13:15 +02:00
Zuhayr
e0cfd8fdbd Merge pull request #10420 from Kearel/sbike
[Feature] Space Bikes!
2015-09-07 13:58:25 +09:30
PsiOmega
affff253bc Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
	code/modules/mob/living/living.dm
	code/modules/mob/mob_grab.dm
2015-09-02 14:58:13 +02:00
PsiOmega
d78db0231b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-02 14:42:27 +02:00
Zuhayr
a00ac82221 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol
Conflicts:
	code/_onclick/rig.dm
2015-08-22 02:36:05 +09:30
Kelenius
bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03:00
Chinsky
317eaf4771 Merge pull request #10101 from mwerezak/shards
Refactors obj flags and changes defined bitflag representation
2015-08-20 19:47:58 +03:00
GinjaNinja32
dc35b0e717 fix wonky diagonal inputs 2015-08-20 09:42:48 +01:00
mwerezak
7f17505e48 Cleans up mob_grab.dm
Moves all of the grab abilities into their own proc instead of having them all dumped into /obj/item/weapon/grab/attack().
2015-08-18 22:02:01 -04:00
mwerezak
ac738f3db4 Moves flags values to item_flags var
Moves flags that seemed to pertain more to equipment to a new item_flags
var in /obj/item
2015-08-18 17:18:25 -04:00
GinjaNinja32
1957029890 HUD cleanup, human/monkey HUD now turns correctly with client.dir 2015-08-18 18:21:25 +01:00
GinjaNinja32
912f689e51 Diagonal, ctrl+dir, and alt+dir actions are now consistent with client.dir 2015-08-18 16:05:37 +01:00
Zuhayr
59d0e28aff Allowed pAIs and AIs loaded into hardsuits to move and rest when control is enabled or the user is unconcious/dead.
Allows AIs/pAIs in rigs to use the selected module via middle click.
2015-08-13 17:09:22 +09:30
Kelenius
60196df634 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
PsiOmegaDelta
03578d4ea3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-06 08:12:38 +02:00
Kearel
10359889e7 Fixes
Slight change to airflow/animations interaction when buckled
2015-08-04 13:41:27 -05:00
RavingManiac
aeea42ded9 Refactors floating and magboot checks. Fixes #10256 2015-08-03 23:19:04 +10:00
mwerezak
9468508226 Adds move cooldown for inventory management, clicking on adjacent atoms 2015-07-05 13:10:52 -04:00
mwerezak
06000a6984 Adds setMoveCooldown() 2015-06-30 22:30:12 -04:00
PsiOmegaDelta
9887f16135 mob/living/Life() now has basic gravity handling (no overrides). 2015-06-17 15:32:23 +02:00
PsiOmega
ee88e7b8b4 Base Life-addition() 2015-06-13 13:36:08 +02:00
Hubblenaut
1b3ddb8633 Merge remote-tracking branch 'upstream/dev' into dev
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/mob/mob_grab.dm
2015-05-12 14:39:21 +02:00
Hubblenaut
fb8812d1b7 Adds knifing, pressing eyes, jointlocking, headbutting, pushing, dancing and forcing onto the floor
fixup
2015-05-10 17:54:34 +02:00
PsiOmega
799a5b79db Ensures new players cannot ghost by moving, really breaks things. 2015-04-20 08:37:57 +02:00
Hubblenaut
a40ef85a5f Merge branch 'grab' into dev
Conflicts:
	icons/mob/screen1.dmi
2015-04-19 16:00:28 +02:00
PsiOmega
2ddf8ecf28 Movement fixes.
Ensures observers use Process_Incorpmove() despite being dead, while disallowing the once living from doing the same.
Ensures incorporeal creatures denied moving unto holy ground don't keep calling more movement code.
2015-04-15 14:21:58 +02:00
PsiOmega
d8f1045e53 Moving while dead now auto-ghosts you.
Also removes now redundant incorporeal_move check that's made further up the proc.
2015-04-15 09:19:19 +02:00
PsiOmega
1511e2b3f4 Ports /vg/'s Nas-Sie remake.
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
2015-04-12 16:19:16 +02:00
Hubblenaut
ea49978958 Grab Basics 2015-04-01 19:07:39 +02:00
mwerezak
398459c2e7 Merge remote-tracking branch 'upstream/dev' into inventoryfix
Conflicts:
	code/modules/organs/organ_external.dm
2015-03-31 02:13:22 -04:00
mwerezak
9b2f5cea33 Merge remote-tracking branch 'upstream/dev' into inventoryfix
Conflicts:
	code/game/gamemodes/revolution/rp-revolution.dm
	code/game/machinery/kitchen/juicer.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/stool_bed_chair_nest/stools.dm
	code/modules/destilery/main.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/carbon/monkey/inventory.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
2015-03-31 01:37:55 -04:00