Chinsky
143f036ccd
Merge pull request #8745 from Kelenius/ofLingsAndMeta
...
Removes the bullshit ling meta message
2015-04-08 03:24:15 +03:00
Chinsky
4a897e47b9
Merge pull request #8641 from PsiOmegaDelta/CultVisualNetwork
...
Cult Visual network
2015-04-06 20:19:49 +03:00
Kelenius
9a60cd6222
Removes the bullshit ling meta message
2015-04-04 13:40:15 +03:00
Chinsky
96dd9df079
Merge pull request #8704 from Zuhayr/dev
...
Fixes
2015-04-02 23:49:54 +03:00
Chinsky
c584155edd
Merge pull request #8688 from PsiOmegaDelta/Events
...
Adds more events, misc event changes.
2015-04-02 23:43:45 +03:00
Zuhayr
8475be5d4e
Fixes a few incidental bugs with the antag and organ changes.
2015-04-01 06:33:47 -07:00
Zuhayr
03d5c2a5cd
Fixes #8619
2015-04-01 05:55:34 -07:00
PsiOmega
56a8195d1c
Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork
...
Conflicts:
code/setup.dm
2015-04-01 12:47:31 +02:00
PsiOmega
93ac826f02
Adds more events, misc event changes.
...
Only two more this time:
Random space dust attack.
Random gravity failure.
Moves space vines from moderate to major events, due to its now more dangerous nature.
Removes now irrelevant alien/ninja customized event handlers.
Adds Excel sheet for aiding in event probability calculations.
2015-03-31 13:07:27 +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
mwerezak
cdfce64ad0
Replaces uses of u_equip() with remove_from_mob() or drop_from_inventory(), where appropriate.
2015-03-30 22:05:00 -04:00
PsiOmega
a9034bca66
Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork
...
Conflicts:
code/modules/mob/living/simple_animal/shade.dm
code/setup.dm
2015-03-30 22:55:24 +02:00
mwerezak
1b4e13aabc
Removes unnecessary and cruft procs from mob/inventory.dm
2015-03-30 05:28:09 -04:00
=
d77010221c
Merge with dev.
2015-03-30 08:36:52 +10:30
Zuhayr
0c3a18b0b6
Merge pull request #8380 from volas/sanitize_procs
...
[DNM] sanitize() and text.dm refactoring
2015-03-29 00:57:33 +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
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
Zuhayr
c0887333bc
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
2015-03-27 11:13:53 +10:30
Zuhayr
aa6439096c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-26 23:25:26 +10:30
Zuhayr
139edb4f9b
Fixed up some boilerplate.
2015-03-26 23:24:56 +10:30
Zuhayr
efa6f0d3c9
Finalized monkey species definitions and icons.
2015-03-26 14:45:41 +10:30
Zuhayr
ba648e3e8d
Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.
2015-03-26 12:45:12 +10:30
PsiOmega
b39a486e61
Fixes duplicate uplink reference.
...
This is the second time I have to fix it for the rifle. Stop breaking it.
2015-03-25 23:14:02 +01:00
Zuhayr
97112c8a4c
Replaced display_name with name, worked on severing limbs and damage propagation.
2015-03-25 19:07:22 +10:30
Zuhayr
d26800d29c
Preliminary work on converting all monkeys to a human subspecies.
2015-03-25 02:15:45 +10:30
Zuhayr
3fe4162719
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-25 00:29:59 +10:30
Zuhayr
b9072baa97
Merge with dev.
2015-03-24 14:41:07 +10:30
mwerezak
8ff15108f9
Reduces 14.5mm ammo box cost to 2 TC, slight rename
2015-03-23 00:16:48 -04:00
volas
f8822626bb
sanitize() refactor: second pass(other sanitize functions)
2015-03-23 01:38:09 +03:00
volas
855755f808
sanitize() refactor: first pass (sanitize)
2015-03-22 23:31:19 +03:00
Zuhayr
a8f44cae98
Resolving bugs with spawn order and delays.
2015-03-21 11:49:42 +10:30
Zuhayr
d8018db5c9
Finally got things working from vote to roundstart to join to death.
2015-03-21 11:14:59 +10:30
Zuhayr
fe6cd5af13
Dropped antagonist folder down a directory level.
2015-03-21 11:14:48 +10:30
Zuhayr
4d14722b2a
Split antagonist.dm up.
2015-03-21 11:14:47 +10:30
Zuhayr
2c269e5159
More work on Heist. Remapped the Vox shuttle and added a base for it. Tweaked spawn values etc.
2015-03-21 11:13:48 +10:30
Zuhayr
8d698f0c06
First pass on making heist a pirate mode (human based)
2015-03-21 11:13:05 +10:30
Zuhayr
4fdc00dee4
Working on gamemode/antagonist code.
2015-03-21 11:08:22 +10:30
Zuhayr
d79af13a2c
Resolving bugs with the game mode refactor.
2015-03-21 11:08:21 +10:30
Zuhayr
98da191ac3
Gamemode refactor, lots of code shuffles, PR will have details.
2015-03-21 11:08:17 +10:30
PsiOmega
7ab57a4917
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/storage/fancy.dm
code/modules/mob/living/carbon/human/life.dm
2015-03-20 08:44:52 +01:00
PsiOmega
3d9d05afce
Fixes #8107 .
...
The announcer again has its given name, rather than a randomly selected one.
The announcer now states its business, rather than talks about it.
The announcer now uses the proper frequency.
2015-03-19 21:33:58 +01:00
PsiOmega
1f5de7f64f
Ports /tg/ & Paradise ghost sight.
...
Ghosts can now toggle darkness and seeing ghostly things independently.
Includes some extra work to allow observers to see AI eyes while (mostly) preventing cultists from doing the same.
2015-03-19 16:14:02 +01:00
Chinsky
d2518798ec
Merge pull request #8486 from PsiOmegaDelta/NanoLaws
...
NanoUI - Silicon law manager
2015-03-17 14:24:30 +03:00
Chinsky
376657bdd7
Merge pull request #8353 from Glloyd/goonschedu
...
Goon Process Scheduler for BS12
2015-03-17 10:04:21 +03:00
PsiOmega
7f68403ae4
NanoUI - Silicon law manager
...
NanoUI interface for viewing silicon laws, accessible to both the silicon and admins.
Malf AIs and admins may also add, edit, and remove laws.
2015-03-17 07:22:02 +01:00
Chinsky
149bf70e3e
Soulstones now require victim to actually be dead or maimed, as message says, instead of just sleeping.
...
Also shades now get their former icon and stuff like ghosts, for maximum spooky.
2015-03-13 13:16:59 +03:00
Zuhayr
e0f23aead5
Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.
2015-03-11 21:17:51 +10:30
PsiOmega
57c0591283
Fixes ninja spawn logic.
...
Fixes the logic I re-made after a PR comment without double-checking it.
Changes ninjastart to use the actual landmarks instead of locs for consistency.
2015-03-09 19:22:07 +01:00
