GinjaNinja32
631ff21980
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/objects/items/weapons/implants/implantcase.dm
code/game/objects/items/weapons/melee/energy.dm
code/modules/mob/living/carbon/human/emote.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/silicon/robot/drone/drone.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/nano/modules/crew_monitor.dm
code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
Chinsky
7b1656f40c
Merge pull request #10470 from Karolis2011/dev-freeze
...
[Dev-Freeze] Replace \red with <span> in runes.dm, fix many "his/her/their" gender messages
2015-08-11 20:07:06 +03:00
SomeoneElse
8c0984d5b1
Fix gender issues, some typos from various files
2015-08-11 13:41:40 +03:00
PsiOmegaDelta
4bb6749f24
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-11 08:34:46 +02:00
PsiOmegaDelta
e1aff6a668
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/machinery/doors/door.dm
code/game/machinery/portable_turret.dm
2015-08-11 08:21:06 +02:00
PsiOmega
e0525bec35
Fixes #10447 .
...
Corrects Icarus' designation.
2015-08-09 12:21:52 +02:00
PsiOmegaDelta
34fdc4712e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/names.dm
code/game/jobs/job/silicon.dm
code/game/objects/items.dm
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/nano/modules/alarm_monitor.dm
code/setup.dm
2015-07-14 08:21:12 +02:00
Zuhayr
cd380aba24
Removed the last few references to MODE, fixed some oversights with player_is_antag().
2015-07-14 05:19:00 +09:30
Zuhayr
7bb9ca6ec2
Fixes #10129
2015-07-14 05:18:58 +09:30
Zuhayr
48cf00ca54
Merge with dev-freeze.
2015-06-21 20:45:47 +09:30
Zuhayr
ec5e05b9f1
Antagonist system refactor. Fixes #9495 , #9290 , #9521 , #8800 and #9465 .
2015-06-21 18:08:26 +09:30
PsiOmegaDelta
cc7c502fb8
Updates emag attackby usages to emag_act where it's not too much of a headache.
2015-06-16 09:34:13 +02:00
PsiOmegaDelta
784f4d8705
Merge pull request #9792 from Techhead0/requestConsole
...
Request Console part two: NanoUI
2015-06-12 15:42:27 +02:00
Techhead0
5bd05df455
Fixes double request console messages for prison break event.
2015-06-11 19:38:57 -04:00
PsiOmegaDelta
079b0af6b0
Adds spinning animation for meteors.
2015-06-05 15:55:39 +02:00
PsiOmegaDelta
a07d20d657
Ports /tg/'s meteor implementation.
...
Merges the two meteor events into one, and now takes severity into consideration instead.
Including the basic meteors there are also new types ranging from flaming to radioactive which may drop appropriate types of ore.
2015-06-05 14:58:35 +02:00
PsiOmegaDelta
00953968dd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-04 08:20:00 +02:00
PsiOmegaDelta
bb1dbe9f67
Merge pull request #9656 from Techhead0/requestConsole
...
Request Console cleanup.
2015-06-04 08:01:13 +02:00
Techhead0
0195c179ff
Request Console cleanup.
...
Changes screen and departmentType to use defines and bitflags instead of magic numbers.
Moves code from the message sender to send_rc_message().
One console's destruction no longer prevents the entire department from receiving messages.
2015-06-03 22:38:04 -04:00
Zuhayr
04d1b40e3d
Merge pull request #9626 from GinjaNinja32/vine_event_fix
...
Fixes vine/infestation events not working with new lighting
2015-06-03 04:00:21 +09:30
PsiOmegaDelta
3988d6ac90
Merge pull request #9388 from Techhead0/prisonBreak2.0
...
Refactors and expands the Prison Break event.
2015-06-02 18:58:20 +02:00
GinjaNinja32
24adb8eb42
Fixes vine/infestation events not working with new lighting
...
Also adds a helper for finding whether there are any simulated atoms on a turf
2015-06-02 16:56:10 +01:00
PsiOmegaDelta
1a74b536d7
Active role counting tweak.
...
The number of Any players now properly respects activity.
Borgs should now properly increase the number of players for a given job.
2015-06-02 15:46:01 +02:00
PsiOmega
40a373a7fe
APC event tweak.
...
The APC event now instead checks for the new is_critical flag.
2015-06-01 18:13:05 +02:00
Techhead0
637135b0b5
Removes relative pathing, adds better comments.
2015-06-01 00:02:56 -04:00
Techhead0
2b8d6db61e
Refactors Prison Break event.
...
Affects the Brig, Virology, Xenobiology or all three.
Adds warning messages to Engineering request consoles and AI.
Prevents doors from bolting open if unpowered
Reduces light overload frequency.
2015-05-31 23:25:52 -04:00
PsiOmega
5e84bfa57c
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/clothing/spacesuits/rig/suits/ert.dm
2015-05-30 15:59:54 +02:00
GinjaNinja32
b9cd4ba023
Adds logging and admin investigatability (read: checking what the virus does) to virus events
2015-05-27 10:36:45 +01:00
PsiOmega
b52cf35680
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/projectiles/projectile.dm
2015-05-12 13:40:47 +02:00
PsiOmega
144b11ed14
Adds announcement to the space vine event.
2015-05-10 20:40:49 +02:00
Mloc
e602a7e286
remove the sub-area system
...
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 17:06:29 +01:00
PsiOmega
a49e6035a9
Fixes #9029 .
...
Reduces the announcement message delay for spiders from 800-900 seconds to 180-300 seconds.
Number of spiders now based on severity, with a moderate level event spawning as many spiders as before.
2015-04-30 10:22:58 +02:00
PsiOmega
27e91b3fa0
Cameras now have a small chance of being permanently destroyed.
2015-04-27 19:09:46 +02:00
PsiOmega
4bddde11ae
Using cameranet cameras to avoid burning out things like ERT/mercenary helmet cameras and traitor spy cams.
2015-04-27 11:14:31 +02:00
PsiOmega
ed81d9fd63
Adds the ACP damage event.
2015-04-27 10:56:14 +02:00
PsiOmega
8626a83675
Adds the camera loss event.
2015-04-27 10:47:45 +02:00
PsiOmega
1fea589ad7
Merge remote-tracking branch 'upstream/dev' into TheSummoning
...
Conflicts:
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02:00
PsiOmega
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmega
eee67109d1
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/say.dm
2015-04-23 13:15:43 +02:00
PsiOmega
4cc524265b
Change of random virus targets.
...
The random virus event will now only infect mobs on station and which currently have a player that has been active in the last 5 minutes.
Placeholder until a more indepth discussion about what to do about the random event is concluded.
2015-04-22 12:27:28 +02: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
Chinsky
c584155edd
Merge pull request #8688 from PsiOmegaDelta/Events
...
Adds more events, misc event changes.
2015-04-02 23:43:45 +03:00
PsiOmega
9de5b19625
Fixes event weights not being affected by having been fired before.
...
This mainly due to using a completely incorrect list, event_last_fired (used by the old system) instead of last_event_time.
2015-03-31 15:53:16 +02:00
PsiOmega
e1f8af1997
Cleans up announcement sound handling. Plays communication blackout sound at half volume.
2015-03-31 14:51:22 +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
Zuhayr
0c3a18b0b6
Merge pull request #8380 from volas/sanitize_procs
...
[DNM] sanitize() and text.dm refactoring
2015-03-29 00:57:33 +10:30
volas
5fee41d4ba
sanitize() refactor: third pass (misc)
2015-03-25 01:05:21 +03:00
Zuhayr
d26800d29c
Preliminary work on converting all monkeys to a human subspecies.
2015-03-25 02:15:45 +10:30
Zuhayr
98da191ac3
Gamemode refactor, lots of code shuffles, PR will have details.
2015-03-21 11:08:17 +10:30
