PsiOmega
990530d118
Ports /vg/'s spell system for the sake of cult porting.
...
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
2015-04-09 20:08:06 +02:00
Chinsky
e6f83f8fa2
Merge pull request #8707 from PsiOmegaDelta/Garbage
...
Ports /vg/&/tg/'s garbage collector.
2015-04-09 08:50:12 +03:00
Chinsky
7b15bd59e5
Merge pull request #8768 from Yoshax/emergencymessage
...
Emergency message changes
2015-04-09 08:15:19 +03:00
GinjaNinja32
6699cab7bf
Adds selectable default languages to all mobs which can speak
...
Set-Default-Language verb to set, Check-Default-Language verb to check
There are also links to set and reset in Check-Known-Languages
2015-04-08 15:18:59 +01:00
PsiOmega
71a8ddf50e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/modules/paperwork/paper.dm
code/modules/projectiles/projectile.dm
2015-04-08 10:55:26 +02:00
Zuhayr
fe0185697e
Some dislocation fixes/adjustments.
2015-04-07 19:50:26 -07:00
Zuhayr
cee229733e
Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into dev
2015-04-07 18:38:59 -07:00
Chinsky
175fdf57e6
Merge pull request #8703 from PsiOmegaDelta/Map
...
Area/Camera network refactor - Part 1
2015-04-07 21:41:06 +03:00
Yoshax
d78ae0d509
Merge branch 'aiemergencymessage' into emergencymessage
2015-04-06 20:19:27 +01:00
Yoshax
5a34b1481b
Big emergency message changes
2015-04-06 20:17:18 +01:00
Chinsky
4a897e47b9
Merge pull request #8641 from PsiOmegaDelta/CultVisualNetwork
...
Cult Visual network
2015-04-06 20:19:49 +03:00
PsiOmegaDelta
fd1b6343f0
Merge pull request #8655 from volas/sanitize_procs2
...
sanitize(), part 2
2015-04-06 15:16:17 +02:00
Yoshax
b69ab10da0
Merge branch 'dev' into aiemergencymessage
2015-04-05 17:39:30 +01:00
PsiOmega
75757a48f6
Merge remote-tracking branch 'upstream/dev' into Map
2015-04-05 09:55:41 +02:00
Zuhayr
d254725766
Oversights.
2015-04-04 21:49:05 -07:00
Zuhayr
fa8ee58183
Fixes a monkey runtime and updates head reattachment surgery.
2015-04-04 20:03:54 -07:00
Chinsky
14124985cc
Offhand gun doesn't decrease probability of accidental shot now.
2015-04-05 05:29:04 +03:00
Chinsky
ae75e3555e
Merge remote-tracking branch 'remotes/upstream/dev-freeze' into conscience
...
Conflicts:
code/modules/mob/living/carbon/human/human_attackhand.dm
2015-04-05 05:23:14 +03:00
Zuhayr
ee657d64f8
Fixes handle_grasp() spam.
2015-04-03 19:15:47 -07:00
Mustafa Kalash
94a56e3c2b
Adds a toggle for allowing a target to use a radio (handheld or headset.)
2015-04-03 17:42:16 -04:00
Zuhayr
eeee0dfb9f
Numerous runtime/oversight fixes.
2015-04-03 06:12:36 -07:00
Zuhayr
6ce278a486
How did this sneak back in? Removes a monkey file.
2015-04-03 05:42:07 -07:00
Zuhayr
a3ed7fc033
Should fix the head and hair issues from the organ rewrite.
2015-04-03 05:41:33 -07:00
PsiOmega
8e55ad8114
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/mob.dm
2015-04-03 09:33:05 +02:00
PsiOmega
4326b8c5d8
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-04-03 09:22:23 +02:00
mwerezak
a7e07fc312
Fixes #8716
2015-04-02 17:41:36 -04:00
volas
2622d2dbfc
sanitize() refactor: fourth pass
2015-04-03 00:40:57 +03:00
Yoshax
e425105349
Does the span class stuff
2015-04-02 21:50:14 +01:00
Yoshax
61691a9603
Adds emergency message for AI
2015-04-02 21:09:48 +01:00
PsiOmega
c305b389f7
Ports /tg/'s & /vg/'s garbage collector/object pool.
...
It's happening. Kind of, the code is there.
2015-04-02 14:48:28 +02:00
PsiOmega
ca70ac1efe
Fixes #8582 .
...
simple_animal/Life() did not terminate properly on death.
Caused issues with bears that would update their icons if Life() returned true (despite having called death).
2015-04-02 09:47:20 +02:00
Zuhayr
8def76f849
Removing some debugs.
2015-04-01 18:06:46 -07:00
Zuhayr
84b903cf69
Fixes #8702 properly.
2015-04-01 17:57:28 -07:00
Zuhayr
3cc34ab55e
Organ tweaks/fixes.
2015-04-01 17:38:15 -07:00
Zuhayr
6e0e98469c
Fixes #8709
2015-04-01 16:59:48 -07:00
Zuhayr
63a2fc6bff
Fixes #8682
2015-04-01 07:05:58 -07:00
Zuhayr
8475be5d4e
Fixes a few incidental bugs with the antag and organ changes.
2015-04-01 06:33:47 -07:00
Zuhayr
5983f01d22
Fixes #8618
2015-04-01 05:56:46 -07:00
Zuhayr
ed54a8aaa7
Fixes #8693
2015-04-01 05:35:59 -07:00
Zuhayr
57f5c5d15f
Fixes #8702
2015-04-01 05:18:32 -07:00
PsiOmega
e6cd517f47
Area/Camera network cleanup - Part 1
...
Renames areas for more logical order in alarm consoles and other locations.
Begins dividing the cameras into separate networks instead of being dumped into SS13. Changes c-tags to ensure related cameras are sorted together.
Security updated first.
The AI jump-to-network command now offers a sorted list as well as quick selection (using the chat bar).
2015-04-01 13:12:36 +02:00
PsiOmega
cf45daa66c
Cuts out for now unnecessary parts, to allow merge of functional code.
2015-04-01 12:51:02 +02:00
PsiOmega
56a8195d1c
Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork
...
Conflicts:
code/setup.dm
2015-04-01 12:47:31 +02:00
mwerezak
01ce8d4a1f
Fixes #8696
...
Fixes #8696 , and updates other usages of drop_item() where appropriate.
2015-03-31 20:30:06 -04:00
Kelenius
524ea8aeb7
Fixes a typo
2015-03-31 18:37:15 +03: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
5484a30a13
Allows gloves/shoes to be worn even if one hand or foot is missing.
...
Having a hand or foot removed still drops the worn items, so it still can be used to steal someones gloves/shoes.
The difference is that you can now pick up the dropped item and wear it again if you still have the other hand/foot left.
2015-03-31 01:40:15 -04:00
Chinsky
65f61122b5
Merge pull request #8604 from Zuhayr/limbs
...
Limb objects, severing and cybernetics
2015-03-31 08:38:54 +03: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
mwerezak
582ebcfc59
Typo fix
2015-03-31 00:43:07 -04:00
