Chinsky
286e1cfc6b
Merge pull request #8632 from PsiOmegaDelta/StopTheHurting
...
Fixes #8624 .
2015-03-30 22:36:54 +03:00
Chinsky
c0b62fd94a
Fixes #8488
2015-03-30 22:32:52 +03:00
Chinsky
1a94b6cc35
Fixes #8393
2015-03-30 22:26:46 +03:00
Chinsky
246fc62b1c
Whoops missed a bracket
2015-03-30 22:23:29 +03:00
Chinsky
1e6e7b0146
Fixes #8580
...
Also fixed condition thing where having second pistol would lower chance of main one going off
2015-03-30 22:08:08 +03:00
Chinsky
1a93042226
Fixes #8548
...
Removed referenced to type of ammo used from descriptions.
2015-03-30 22:06:29 +03:00
Chinsky
40cf940f13
Fixes #8564
2015-03-30 22:04:13 +03:00
Chinsky
e3ad4dc013
Fixed #8602
2015-03-30 21:59:50 +03:00
Chinsky
dfdea36479
Fixes #8642
2015-03-30 21:36:41 +03:00
Chinsky
a8ee3ca25e
Merge pull request #8560 from PsiOmegaDelta/PCAILaws
...
PC AI laws.
2015-03-30 21:23:34 +03:00
PsiOmega
ef8b7466ac
Merge remote-tracking branch 'upstream/dev' into NarsiePort
...
Conflicts:
code/modules/projectiles/projectile/change.dm
2015-03-30 20:17:05 +02:00
Chinsky
5837eb2675
Merge pull request #8668 from Yoshax/dev-freeze
...
Fixes #8652
2015-03-30 19:40:13 +03:00
PsiOmegaDelta
fefb55db93
Merge pull request #8674 from GinjaNinja32/rig_guns
...
Rig weapon fixes
2015-03-30 15:02:22 +02:00
PsiOmegaDelta
6f1f18c3a7
Merge pull request #8647 from Kelenius/ofStaffsAndChange
...
Of staffs and change
2015-03-30 13:18:51 +02:00
mwerezak
1b4e13aabc
Removes unnecessary and cruft procs from mob/inventory.dm
2015-03-30 05:28:09 -04:00
mwerezak
e6d19faeba
Cleans up mob/inventory.dm, fixes removed_from_mob() not calling dropped() on items.
...
Updates u_equip() accordingly in the other inventory.dm files as well, and moves some random inventory procs from mob.dm to mob/inventory.dm.
2015-03-30 04:35:57 -04:00
Kelenius
bb2ad4efdb
More change for the staff of change
...
Better item dropping
elseif instead of if
No more create_new_xenomorph
And a span class
Yay for named xenos
2015-03-30 10:11:41 +03:00
GinjaNinja32
e342bf8a3a
Fixes #8673 , also makes some messages clearer and removes the twin cooldowns on rig weapons
2015-03-30 03:54:18 +01:00
Zuhayr
2f60c4b82d
Merge pull request #8638 from Zuhayr/vox
...
Removes the vox armalis.
2015-03-30 08:56:34 +10:30
=
d2ede0afd4
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2015-03-30 08:55:49 +10:30
Yosh
e4b827134e
Fixes #8652
...
Fixes #8652
Took me long enough, I'm pretty retarded, and to answer Psi's question,
yes, this fixes it.
2015-03-29 23:19:21 +01:00
=
d77010221c
Merge with dev.
2015-03-30 08:36:52 +10:30
PsiOmega
59638b2300
Fixes #8661 .
...
Now ghosts the AI before it's deleted, setting the respawn timer.
2015-03-29 16:53:48 +02:00
PsiOmega
710abd0921
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/spells/mind_transfer.dm
2015-03-29 16:23:06 +02:00
PsiOmega
23bbbb7e4c
Moves sanitize(message) up a level for now.
2015-03-29 13:51:19 +02:00
PsiOmega
1a000b0e0f
Merge remote-tracking branch 'upstream/dev' into NarsiePort
...
Conflicts:
code/modules/mob/living/carbon/human/say.dm
2015-03-29 13:04:53 +02:00
PsiOmega
916da8e8a3
Refactors say down to /mob/living/say level.
2015-03-29 12:54:53 +02:00
PsiOmega
464d702d4b
Mob refactoring.
...
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
2015-03-29 10:44:31 +02:00
mwerezak
c59fac2e16
Adds unloaded item state for the STS-35.
2015-03-29 02:40:57 -04:00
mwerezak
ba9b8756da
Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file
2015-03-29 01:52:26 -04:00
GinjaNinja32
e7b4370772
Fixes #8650
2015-03-28 22:01:02 +00:00
PsiOmega
c93c81e77c
Fixes #8624
...
Synthetics are no longer described as being wounded when dragged.
2015-03-28 20:28:39 +01:00
PsiOmega
5b8f055595
Merge remote-tracking branch 'upstream/dev' into PCAILaws
...
Conflicts:
code/game/objects/items/weapons/AI_modules.dm
2015-03-28 20:26:24 +01:00
Kelenius
47ad072225
Merge branch 'Baystation12/dev' into ofStaffsAndChange
...
Conflicts:
code/modules/projectiles/projectile/change.dm
2015-03-28 19:37:50 +03:00
Zuhayr
0c3a18b0b6
Merge pull request #8380 from volas/sanitize_procs
...
[DNM] sanitize() and text.dm refactoring
2015-03-29 00:57:33 +10:30
mwerezak
36cf695256
Adds Skowron's inhand icons for various guns
2015-03-28 02:10:09 -04:00
Techhead0
ac2ded9c86
Voidsuit Suit Storage
...
Tanks can now be installed in the suit storage slot of voidsuits, a la
helmets and magboots. Order of removal is Tank>Helmet>Boots.
2015-03-27 21:56:05 -04:00
Zuhayr
accbb02b7f
Fixing bugs.
2015-03-28 11:53:39 +10:30
Zuhayr
8f242740a8
Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.
2015-03-28 11:01:11 +10:30
Chinsky
3cd206535a
Merge pull request #8639 from mwerezak/holocarp-fix
...
Holopad fix, makes holodeck objects slightly transparent
2015-03-27 20:57:30 +03:00
mwerezak
486940c9e0
Makes holo objs slightly transparent
2015-03-27 10:32:41 -04:00
PsiOmega
827351dda5
Merge remote-tracking branch 'upstream/dev' into Mask2
2015-03-27 14:16:55 +01:00
PsiOmega
1131c76d45
Cult visual network.
...
Implementation of a cult visual network, similar to the original camera network.
Includes the "eye" itself and the initial construction of a mob that can control one.
2015-03-27 14:16:48 +01:00
Chinsky
aed4156a77
Merge pull request #8587 from PsiOmegaDelta/EyeRefactoring
...
Refactoring of the AI eye code.
2015-03-27 11:03:15 +03:00
Zuhayr
c5d42f3a4b
More work on severing, improvements to yank-out-object.
2015-03-27 17:51:10 +10:30
Zuhayr
59adbae59e
Removes the vox armalis.
2015-03-27 16:41:32 +10:30
PsiOmegaDelta
ce414b2eba
Merge pull request #8637 from mwerezak/holocarp-fix
...
Fixes holocarp not being transparent
2015-03-27 07:07:20 +01:00
mwerezak
872e0a0e84
Fixes holocarp not being transparent.
2015-03-27 01:36:36 -04:00
GinjaNinja32
05f9411910
Fixes webbings utilising bluespace storage for infinite storage (again)
2015-03-27 03:06:29 +00:00
Zuhayr
c0887333bc
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
2015-03-27 11:13:53 +10:30
