Chinsky
a6c7093818
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into robust-squash
...
Conflicts: lots
2014-06-29 19:16:36 +04:00
Higgin
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
Chinsky
e7684dd6e9
Adds overmap system and examples of it's usage.
...
Unticked, as it disables space edge transition.
2014-06-29 06:48:21 +04:00
mwerezak
112bfbc6c3
Removes taj whisker emote
2014-06-28 19:52:00 -04:00
Zuhayr
cf1abf65d9
Added better checks to leap(), prevented leap spamming (hopefully).
2014-06-29 09:20:04 +09:30
Zuhayr
19bb5014a9
More work on custom gear.
2014-06-29 04:22:09 +09:30
mwerezak
7189dc9d0d
Tweaks nonverbal emote frequency
2014-06-28 12:20:20 -04:00
mwerezak
ac0bf7b853
Improves the implementation of non-verbal languages
...
Cleans out the nonverbal language check from say_understands(), which
now is responsible for language only.
Nonverbal languages have a chance of causing an emote when used.
Adds sign languages, which have no verbal component.
2014-06-28 12:19:34 -04:00
Zuhayr
4236ddc11c
Merge branch 'newgear' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-29 00:59:20 +09:30
mwerezak
b25f5d8aa6
In space, no one can hear you shriek
...
Or chimper for that matter. Also fixes deaf people hearing vox shriek.
2014-06-28 10:35:20 -04:00
Zuhayr
44d6bc199a
Merge pull request #5379 from PsiOmegaDelta/AIStun
...
AI now handles the sunned status like other creatures do in their life.dm file
2014-06-28 19:43:27 +09:30
PsiOmega
972bbac033
AI now handles EMP-stun like other creatures do in their life.dm file
...
Previously AI would be stunned indefinitely after being hit with an EMP-blast. This would prevent emergency shutters from being operated.
The stun status is now adjusted down in the Life()-proc like is done in the base living.dm, which the AI living.dm does not ..() call.
2014-06-27 21:24:01 +02:00
Zuhayr
0a79a21e24
Fixed an oversight with RAD_ABSORB and collapsing.
2014-06-26 21:07:25 +09:30
Zuhayr
2ee8f78f75
More icon changes, updates item paths, moves vox cortical stack spawn to raider proc, makes vox whitelisted and spawnable with internals.
2014-06-26 08:47:58 +09:30
Zuhayr
31ff464d1c
Couple of small tweaks.
2014-06-25 21:52:01 +09:30
Chinsky
cc9cf46dbe
Merge pull request #5359 from Baystation12/master
...
master -> dev
2014-06-25 15:37:04 +04:00
Zuhayr
58fc63f6ff
Merge branch 'newgear' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-25 20:03:12 +09:30
Zuhayr
30bf9302d6
Update cat.dm
2014-06-25 19:57:15 +09:30
Zuhayr
808ca3aea4
Merge pull request #5355 from comma/holder
...
Moved scooping into a separate helper.
2014-06-25 19:55:24 +09:30
Zuhayr
515e78f760
First pass on custom loadouts.
2014-06-25 15:47:38 +09:30
Zuhayr
3ab7e510d5
Removed reference to :b in drone spawn text.
2014-06-25 14:34:28 +09:30
Chinsky
dfcff0468c
Allows monkeys to be scooped up too.
2014-06-24 15:14:17 +04:00
Zuhayr
4e673d047e
Merge branch 'spawnpoints' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-24 19:22:18 +09:30
Chinsky
481f3caec5
Moved scooping into a separate helper.
2014-06-24 13:46:15 +04:00
Zuhayr
b67bb6470d
Made cats pick-up-able.
2014-06-24 14:41:08 +09:30
Zuhayr
24730cfd9f
Drones now have plasma cutters instead of emags.
2014-06-24 14:11:08 +09:30
Zuhayr
96bbe1d9db
Added spawnpoint datum, moved existing latejoin spawn to datum setup.
2014-06-24 13:33:48 +09:30
Zuhayr
b63708577b
Merge pull request #5345 from comma/monkey_revenge
...
Monkey cube now expand when eaten, leading to !!FUN!!
2014-06-24 11:41:33 +09:30
Zuhayr
e27cdb3620
Fixes #5323
2014-06-24 11:24:19 +09:30
Zuhayr
ef277f1e6b
Added extra bit of info to drone spawn.
2014-06-24 11:24:11 +09:30
Zuhayr
14bf0f064c
Removed ability for drones to talk on Binary.
2014-06-24 11:23:59 +09:30
Chinsky
6393cb15d8
Merge pull request #5332 from mwerezak/wound-infections
...
Gives the suit coolers a proper process() proc
2014-06-24 05:32:47 +04:00
Chinsky
4cd4217488
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into monkey_revenge
...
Conflicts:
code/modules/organs/organ_external.dm
2014-06-24 04:22:28 +04:00
Chinsky
ece48ae0c4
Moved same code into single organ helper to handle embedding.
2014-06-24 04:09:35 +04:00
Mloc-Argent
a33cb7272b
Merge remote-tracking branch 'upstream/master' into dev
2014-06-23 20:57:47 +01:00
Zuhayr
a6f64ccd9c
Merge pull request #5330 from mwerezak/emergency-shuttle
...
Updates emergency shuttle controller to use shuttle datums
2014-06-23 21:19:36 +09:30
mwerezak
e225661c2c
Fixes #5193
2014-06-23 02:53:09 -04:00
mwerezak
67d5d56a12
Gives the suit coolers a proper process() proc
2014-06-23 02:31:36 -04:00
mwerezak
dc304026a9
shuttle_controller now uses a shuttle datum
2014-06-22 18:10:56 -04:00
Chinsky
7e56df8689
Merge pull request #5308 from mwerezak/wound-infections
...
Re-enables infections, implements a wound infection system, improves body temperatures
2014-06-22 22:04:25 +04:00
Zuhayr
65013ac5a1
Merge pull request #5325 from mwerezak/temperature-expose
...
Fixes FEA temperature_expose() being used instead of ZAS fire_act().
2014-06-23 00:19:15 +09:30
Zuhayr
8e6c12a405
Merge pull request #5324 from Loganbacca/bayfix
...
Preview icon render fix
2014-06-22 22:13:17 +09:30
Zuhayr
1cfb9b6ea1
Merge branch 'master' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-22 21:58:46 +09:30
Zuhayr
183ee20ab6
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-06-22 21:58:30 +09:30
Zuhayr
bb8951a53c
Makes forks usable.
2014-06-22 21:49:55 +09:30
Mloc
af60005aad
Merge pull request #5317 from comma/master
...
Couple o fixes
2014-06-22 11:13:29 +01:00
mwerezak
37e63dfcb0
Fixes FEA temperature_expose() being used...
...
...instead of ZAS fire_act().
2014-06-22 00:13:22 -04:00
Loganbacca
63f9b93ab0
Preview icon render fix
...
- Fixes #5254
- Changes organ render list to a structured list so we can control the render order
2014-06-22 13:05:41 +12:00
mwerezak
c5d14da602
Fixes pressure and temperature damage for autopsies
2014-06-21 20:38:50 -04:00
mwerezak
7500275c41
Fixes bad capitalization in proc call
2014-06-21 17:07:38 -04:00
