87b0857b93
Refactor wire datums
...
Finish wire port and refactor wire datums to use string keys; widen color
range to support more wires and more colors.
2016-01-22 19:22:09 -06:00
aff9db930d
Merge remote-tracking branch 'upstream/master' into emaggedbots
2016-01-19 14:38:26 +00:00
9a9aaabb8d
Removed bot/Emag() proc. Silicons can't interface with human emagged bots.
2016-01-18 19:12:19 +00:00
577488e0d8
safepick
...
more safepick
2016-01-18 05:46:44 +00:00
9066bc7c4f
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
code/controllers/subsystem/air.dm
code/datums/gas_mixture.dm
code/game/objects/items/devices/scanners.dm
code/modules/mob/living/carbon/human/species.dm
code/modules/mob/living/carbon/life.dm
tgui/assets/tgui.css
tgui/assets/tgui.js
tgui/scripts/interfaces/atmos_filter.ract
2016-01-13 20:07:21 -06:00
95df33b325
Merge pull request #14313 from tkdrg/goooof
...
Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework"
2016-01-08 20:39:16 -03:00
249bda699c
Merge pull request #14428 from KorPhaeron/niknakflak
...
Fixes fake nuke
2016-01-08 07:18:03 -06:00
5589ac7559
Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework"
...
This reverts commit 52a45b629219b43ba668
2016-01-07 23:15:35 -03:00
f2f868e7c7
Vine controller
2016-01-06 02:32:25 -06:00
cc69b62c5c
Fixes fake nuke
2016-01-05 22:51:04 -06:00
b50e8d2a63
removes a bunch of unneeded spawns
...
spawns have a high overhead.
I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
2016-01-02 18:23:02 -08:00
b18c6c2c5c
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
nano/assets/nanoui.js
nano/bower.json
nano/templates/atmos_filter.dot
2016-01-02 18:02:54 -06:00
e5941a59a2
Merge pull request #14124 from KorPhaeron/darkness
...
Advanced Darkness (wizard event)
2016-01-01 00:51:55 -03:00
b9bf6ef547
Advanced Darkness
2015-12-31 19:32:02 -06:00
52a45b6292
Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework
...
OBJECTIVES REWORK: Better Objectives Generation
2015-12-31 03:11:41 -03:00
e57b43276d
Merge pull request #14134 from GunHog/In_This_Episode_Gun_Hog_Teaches_MATH!
...
Fixes Abductor event
2015-12-29 22:51:17 -03:00
17f167bcb7
associative list
2015-12-29 13:33:12 -06:00
834242b808
Fixes Abductor event
...
18,0000 deciseconds = 300 minutes, not 30!
2015-12-28 20:08:26 -06:00
9cf6a315b7
Advanced Darkness
2015-12-28 15:25:42 -06:00
dca91323a4
Merge branch 'master' of https://github.com/tgstation/-tg-station into objectives_rework
...
Conflicts:
code/datums/mind.dm
code/game/gamemodes/antag_spawner.dm
code/game/gamemodes/objective.dm
data/mode.txt
2015-12-28 12:40:51 -08:00
b18cb5fca8
making shit compile
2015-12-28 08:31:20 -06:00
15d4ad156c
Final (I hope) weather tweaks
2015-12-24 23:03:32 -06:00
70060cb6c1
Weather datums
2015-12-22 05:31:46 -06:00
ef415278aa
Merge pull request #13830 from Incoming5643/nothing_ever_works_right_away_its_just_the_way_things_are
...
Unbricks the rpgloot event
2015-12-21 12:14:36 -03:00
72a5c2d604
why am I editing in the browser this is terrible
2015-12-21 01:11:29 -05:00
cda01d1457
he's right
2015-12-21 01:10:37 -05:00
1e7fcd3e9f
unbricks the rpgloot event.
...
fixes a rare issue with the imposter event.
2015-12-20 01:15:03 -05:00
b1fe29f73d
What is OOP
2015-12-19 15:32:15 +01:00
f5a57b5ced
Fixes anomalies spawning same place
2015-12-19 15:30:23 +01:00
bc164c9498
Merge pull request #13582 from Incoming5643/Ill_turn_this_game_into_a_shitty_F2P_korean_MMO_yet
...
[RPG Loot Intensifies]
2015-12-13 15:04:53 -06:00
4c909afb08
The commit so nice I did it twice
2015-12-11 20:22:10 -05:00
fdc87e9324
Replaces the armor bonus with something that should actually work
2015-12-11 20:12:21 -05:00
7ce9267a7d
The much beloved rpgloot wizard event has been intensified. Modifiers on items can now range between -15 and +15, though items will follow a normal distribution centered around 0. See the PR for exact odds.
...
Additionally items armor values are now also affected by this event, and can add (or remove) up to 15 percent damage from all (defend-able) sources.
Additionally a special new gimmick has been added, new "item fortification scrolls" will be thrown randomly into all containers with room to hold them (read: this mostly means things like backpacks). Using these scrolls on items allows you to rank them up one level (this doesn't change their name though, trust me it's too much to do for a silly event).
BEWARE however that using these scrolls on items with very high modifiers (+10 or more) has a chance of failing and setting fire to the item. The highest possible modifier you can achieve with these scrolls is +19, though again the grand majority of items will burn well before this point.
2015-12-11 19:32:32 -05:00
a5d6d832f8
Merge pull request #13553 from AnturK/cant_say_no_to_probing
...
Fixes Abductor event firing up multiple times
2015-12-11 17:18:46 -06:00
7929c027fa
Merge pull request #13550 from Incoming5643/new_wizard_meta_just_look_for_the_people_who_arent_fucked_up
...
Apprentice clean up / bugfixes
2015-12-11 22:50:46 +03:00
850f8c6792
Merge pull request #13538 from Incoming5643/no_a_blob_didnt_spawn_stop_asking
...
Fixes false alarm picking late round exclusive events early
2015-12-11 22:48:12 +03:00
a8ed812584
Fixes Abductor event firing up multiple times
2015-12-10 19:29:10 +01:00
6a64864805
formally defines apprentices as a kind of antag instead of as "traitors".
...
Wizard events that spare the wizard should now properly spare apprentices too.
Moves renaming as an apprentice to the end of the spawn proc because the input prompt stops various important things (including the sound meant to inform people they got apprentice) from happening until after it's dealt with.
Restores the "+" for positive quality items in RPG loot. The reason this was changed was already fixed, it just was mistakenly never put back.
2015-12-10 12:08:49 -05:00
b376e15830
False alarm will no longer pick events that couldn't have actually happened at that point in the round
2015-12-09 20:52:23 -05:00
bea8d35ff5
Merge pull request #13437 from neersighted/clickable_stats
...
Refactor MC/Failsafe/add Subsystems
2015-12-07 19:58:46 -06:00
13b3f3b923
Some tweaks to vines
2015-12-06 19:47:42 +03:00
e5e76ad2a2
Makes explosive vines a bit saner
2015-12-06 18:11:27 +03:00
34b717afb4
radio_controller -> SSradio, SSbp -> SSnpc
2015-12-04 22:25:24 -06:00
b888cb8333
Merge pull request #13427 from Anonus/vineathon2015
...
Vine fixes and tweaks
2015-12-04 21:40:33 +00:00
7560562269
Well okay SHORT delay then
2015-12-04 16:32:41 -05:00
717b857401
Merge branch 'BeamVines' of https://github.com/RemieRichards/-tg-station into remiepls
...
Conflicts:
code/datums/beam.dm
icons/mob/animal.dmi
tgstation.dme
2015-12-03 23:20:12 -08:00
a2b8d1eb2a
Vine fixes and tweaks.
2015-12-03 15:48:47 -05:00
3a85a3777f
Spares those in critical from the mass mindshuffle event.
...
This was always the intention, but past me made a mistake I know I've made and fixed sense: He assumed that living_mob_list was a list of !stat mobs, when really it was a list of stat != 2 mobs
2015-12-01 23:05:35 -05:00
8f79afd900
Merge pull request #13236 from MrStonedOne/patch-71
...
Makes False Alarm only choose events that actually have alarms
2015-11-29 12:04:21 +03:00
847b4c8931
Update false_alarm.dm
2015-11-28 02:24:19 -08:00
Bjorn Neergaard