e2ce1fa2df
Collapsed Bump() down to carbon from alien and monkey. Stripped out extraneous stuff from carbon/alien HUD. Implemented some life stuff for aliens.
2014-09-30 15:28:30 +09:30
918520df83
Mobs will bob up and down in space and zero-gravity unless they are both wearing magboots and within 1 tile of a dense object/turf.
2014-09-30 01:22:13 +08:00
0c83a95b90
Large merge resultion. Used remote for map conflicts.
2014-09-23 21:41:54 +09:30
da08ce2410
Fixes being able to lie down while buckled in movable chairs
2014-09-17 14:15:03 +02:00
12364f0cd2
Adds typing indicator.
...
It's toggleable as client preference.
Displays dots(codersprite) near the mob when he starts typing a message.
Detects chatline me and say via checking contents.
Detects shortcut input me an say via hacky wrapper that's called now instead of direct say/me verbs.
2014-08-29 15:33:25 +04:00
5b341bd810
IB initial damage now depends on damage taken
...
Also, autohealing IBs no longer stop bleeding, but do stop worsening.
2014-08-16 22:00:55 -04:00
1c5e944ce5
Merge pull request #5954 from Zuhayr/dev
...
No one is going to read this all anyway
2014-08-13 18:33:09 +04:00
c3de9ca3c7
Fixes #5946 and cuts down on duplicate code across Life() procs.
2014-08-11 10:42:32 +02:00
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
170e03d736
Fixes yank out object bloodying the wrong hands
2014-08-07 16:49:44 -04:00
b8f31c0b0a
Train fixes and balancing
...
- Slows trains to 90% of running speed
- Changes train impact damage to only take into account speed, not train length (otherwise you could insta kill people with a long enough train)
- Fixes a bug with towed cars ghosting through closed airlocks
- Stuns mobs who fall off a train that has blown up
- Fixes mobs standing/lying on vehicles
- Fixes exploding trains not decoupling correctly
2014-08-03 20:45:41 +12:00
ea8b08c49b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-25 22:34:40 +09:30
4d1812ba2b
Hydroponics rewrite, details will be in PR. Big commit.
2014-07-25 22:16:04 +09:30
d5e9851b62
integrate XGM into the code
...
New turf proc: assume_gas(). Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
more.
Zones now process all fire data and existance in one go, fire objects
only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
structured for the new gas_mixtures.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-07-22 19:52:12 +01:00
d02e483110
Makes it possible for the AI to alt+left click turfs in camera view and grants ctrl/alt shortcuts to the turret control.
...
AI can now alt+left click turfs in camera view to list and interact with objects in the status tab. For example allows for interacting with emergency shutters beneath grills.
alt-clicking doors now notifies the AI when they are electrified/un-electrified as, unlike most other shortcuts, this doesn't have a visual cue.
When interacting with doors and the AI-control is disabled hacking is now automatically initiated, as if the AI had attempted to open the door 'menu'.
When borgs/AIs try to interact with an emagged door they now receive a feedback message that it's unresponsive.
Parts of implementation done by porting code from tg-station.
2014-07-20 19:20:24 +02:00
5f8723352d
Merging robot_modules.dm and master controller setup.
2014-07-14 09:10:02 +09:30
10ab66aa40
adjusts verb for w_class 1 yankability
2014-07-10 19:58:16 +02:00
326f3821e1
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-09 15:52:31 +09:30
a6e6a8939f
Cleans code up for easier editing
2014-07-08 07:39:49 +02:00
6568533d0d
Fixes canmove updating wrongly on movable chairs
2014-07-08 04:48:21 +02:00
64d2a69a32
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/modules/mob/living/carbon/human/human_damage.dm
2014-07-06 17:50:53 +01:00
25ec90ba26
mob: fix a movement issue
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-07-04 17:54:25 +01:00
97f997dd30
Fixes in wheelchair and different handling of movement
2014-07-02 22:42:18 +02:00
145bfe9770
Implemented suggestions from PR
2014-06-29 19:24:19 +04:00
a6c7093818
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into robust-squash
...
Conflicts: lots
2014-06-29 19:16:36 +04:00
2556d3f227
Stunbatons now run on charge.
...
Adds improvised weapons.
Increases unarmed stun time, decreases push stun time.
Increases melee embedding chance.
2014-06-29 17:46:06 +04:00
d6022017c8
New vehicle loading code
...
- Vehicles now load items on them somewhat like roller beds, allowing you to interact with them
2014-06-21 14:13:25 +12:00
2a6e6bb021
Merge branch 'dev' into mutiny
2014-06-03 21:27:42 -05:00
dc67453796
Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel.
2014-06-03 21:26:34 -05:00
1e135f91af
Merge resolution with master.
2014-06-02 12:05:12 +09:30
3d2cc3cd82
Revert "Merge pull request #4985 from jack-fractal/dev"
...
This reverts commit 1679b4062fb149b273d9colmohici@gmail.com >
Conflicts:
code/datums/visibility_networks/update_triggers.dm
2014-05-31 00:25:56 +01:00
c607872b80
Mutiny fix prereqs for directives
2014-05-25 14:20:37 -05:00
a95a28e303
Merge branch 'dev' into mutiny-fixes
2014-05-18 11:25:36 -05:00
1bd866239f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage
...
Conflicts:
code/datums/mind.dm
code/game/gamemodes/cult/runes.dm
code/game/machinery/doors/door.dm
2014-05-13 20:45:05 -04:00
d23340a49b
Mutiny Mode
2014-05-11 15:03:50 -05:00
1d6655850f
Changes all appropriate instances of toxins to phoron
2014-04-10 15:11:26 -07:00
e6c3fbf071
Changes all appropriate instances of 'Plasma' to 'Phoron'
2014-04-10 01:19:49 -07:00
26f40359fc
Fix for unpinning humans.
2014-02-10 01:38:32 +03:00
810de4ddaa
Merge pull request #4337 from Baystation12/dev-freeze
...
0.1.8 Staging [Do not merge]
2014-01-31 12:40:15 -08:00
b9b6a6d5be
Check for verb removal.
2014-01-31 00:31:41 +03:00
975433f898
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
icons/mob/back.dmi
icons/mob/mask.dmi
2014-01-30 12:14:44 -06:00
b38e1a71be
Fixes #4223
2014-01-30 22:06:57 +10:30
bc48240fff
Generalized yank_out_object().
2014-01-30 21:56:33 +10:30
83ef93c41c
Merge pull request #4270 from Baystation12/master
...
Merge master into Dev
2014-01-11 18:18:03 -08:00
adaccb3c3e
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-11 10:45:57 +10:30
bc6561b9e4
Runtime fix for people that jump back in their body before hitting respawn or just stay in their body for 30 minutes.
...
Who does that? People that cause runtimes, that's who!
(Jerks)
2014-01-10 15:59:40 -06:00
16cc421e34
Tiny objects on ears
2014-01-09 23:45:08 +01:00
8ae2266526
Added captured variable to mobs, non-chair equivalent to being buckled into a chair
2014-01-08 20:49:45 -06:00
5255848719
adding modifications to cult mode, working spirits, and mask transformation procs
2013-12-08 14:12:40 -05:00
d8683f2d39
Revert "Merge pull request #3965 from jack-fractal/dev"
...
This reverts commit fa57b76f2540ee2278edcolmohici@gmail.com >
2013-11-25 11:59:57 +00:00
Zuhayr