Commit Graph

18307 Commits

Author SHA1 Message Date
KorPhaeron
969abebade Adds a religion subsystem 2016-11-17 21:01:22 -06:00
oranges
138e0500a4 Merge pull request #21554 from ChangelingRain/infinitygun
Fixes infinite cooldown KAs
2016-11-15 16:46:13 +13:00
oranges
774a2c96a1 Adds Bank Heists (#19947)
* Bank Heists

* Removes money exporting

* Adds to map

* Minor clean up

* Bills now autostack, now uses normal computer update_icon
2016-11-15 16:43:21 +13:00
coiax
fb997a07a7 Random mouse placement (#21483)
* Restructured handle_environment()

This creates the environment_is_safe() proc for simple_animals

* Mice are placed at roundstart randomly

Rejoyce as wires are bitten in random locations.

* Removes all mice from the maps

* Code review

* Code review II
2016-11-15 16:42:36 +13:00
oranges
fed780fa9b Merge pull request #21540 from Supermichael777/revert-21014-atmosgrenades
Revert "Atmos Grenades"
2016-11-15 16:40:35 +13:00
oranges
d11bb7258a Merge pull request #21529 from Cyberboss/DoTheTruffleShuffle
Storage rustling cleanup/refactor
2016-11-15 16:39:30 +13:00
Joan Lung
78e03d4386 Merge pull request #21534 from lzimann/summonlesserspell
Adds the spell Arcane Barrage to wizards
2016-11-14 14:48:04 -05:00
Joan Lung
40448e731a Fixes infinite cooldown KAs 2016-11-14 11:34:18 -05:00
kevinz000
231eae7b4f [READY]Removes the 1 brute damage from organs (you can now hit people with tongues without killing them) (#21522)
* Update organ_internal.dm
2016-11-14 07:08:32 -06:00
oranges
fea868c6ce Merge pull request #21526 from lzimann/patch-15
Tweaks the projectile speed to be a bit slower
2016-11-14 19:13:47 +13:00
oranges
41551edc4d Merge pull request #21521 from Xhuis/patch-2
Fixes an infinite ambrosia gaia exploit
2016-11-14 19:10:44 +13:00
oranges
3114628719 Merge pull request #21501 from ChangelingRain/lessbelligerentscarabs
Cogscarabs have a faster proselytizer but are worse at guns
2016-11-14 19:03:07 +13:00
oranges
fcf7f0a37a Merge pull request #21500 from ChangelingRain/infinitescarabbag
You can no longer pick up cogscarabs
2016-11-14 19:02:53 +13:00
uraniummeltdown
3bd538a1b3 Adds raw TC to uplink and 10mm ammo variants (#21498)
* adds raw telecrystals to uplink, can be used to refill uplinks and uplink implants, adds 10mm variants to uplink for traitors and nuke ops

* grammar
2016-11-14 19:02:40 +13:00
Supermichael777
5d9bc48034 Revert "Atmos Grenades" 2016-11-13 19:44:29 -05:00
Lzimann
1f4a5434c8 Fixes conflicts and updates spell description. 2016-11-13 22:05:57 -02:00
AnturK
e1a4e8a1db Adds a ventriloquist dummy. (#21511)
* Dummy inital

* Adds dummies to meta and box.

* Minor inhand touchup

* Spelling and log
2016-11-14 12:04:55 +13:00
KorPhaeron
a643cb92f0 Dual (or more!) Wielding (#21397)
* Dual (or more!) Wielding

* Removes an extra line

* Shotguns can't be dual wielded
2016-11-14 12:02:00 +13:00
oranges
3d72f09de2 Merge pull request #21507 from coiax/phylactery-poi
Lich phylacteries are now points of interest
2016-11-14 12:01:20 +13:00
Lzimann
ba0af67f47 Adds a way to disallow having certains spells together. Only added to lesser summon guns/arcane barrage for now. 2016-11-13 20:10:52 -02:00
Lzimann
97055c5172 Removes horrible type check 2016-11-13 17:58:44 -02:00
Lzimann
dc1aebd403 Uncomment the throw/message after shooting with the regular enchanted mosin. 2016-11-13 17:44:30 -02:00
Lzimann
9d23e5ab3c Changes the Lesser Summon guns to Arcane barrage. 2016-11-13 17:30:42 -02:00
Cyberboss
316070be13 Wooweee feeling rustled today 2016-11-13 12:07:04 -05:00
Leo
b0c95f03b0 Tweaks the projectile speed to be a bit slower 2016-11-13 12:07:38 -02:00
Xhuis
8c46164016 Fixes an infinite ambrosia gaia exploit
Fixes #21520
2016-11-12 23:53:58 -05:00
KorPhaeron
2c7452aa41 Allows the HoP to open extra chaplain slots (#21106)
* Allows multiple chaplains

* Fixes typo
2016-11-13 16:51:26 +13:00
uraniummeltdown
4a7349b0f9 Adds a few clothing items and remove access req from AutoDrobe (#21488)
* Adds joy mask, cueball helmet, scratch suit, removes req_access_txt from AutoDrobe

* access req is back :(
2016-11-13 16:33:05 +13:00
Cyberboss
b977f1d5ca Adds the ability for screwdrivers to reverse conveyor belts (#21442)
* Adds the ability for screwdrivers to reverse conveyor belts

* Formatting
2016-11-13 11:08:25 +13:00
oranges
be360f628b Merge pull request #21480 from GunHog/Of_Wizards_And_Fireballs
Wizard Fireball Auto-Disable
2016-11-13 10:48:35 +13:00
Cyberboss
23084b1dfe Makes medibots tricord aware. Changes the tox treatment to charcoal (#21454)
* Fixes #21346

* Made it more general. Fixes a bug with multiple viruses

* Staged too soon

* Mysterious medbot now properly heals oxy

* Finished a todo in there

* Change medibots tox treatment to charcoal
2016-11-13 10:47:15 +13:00
oranges
be34bb4e34 Merge pull request #21449 from Xhuis/terminal_updates
Computer updates
2016-11-13 10:45:40 +13:00
Jack Edge
46f2bd13d0 Lich phylacteries are now points of interest
🆑 coiax
add: Lich phylacteries are now in the "points of interest" for ghosts.
/🆑

Also, a phylactery just appends to the description of the item, rather
than clobbering it.

Balance consideration: if a lich summons magic and a crewmember get a
scrying orb, they'll be able to locate the phylactery immediately. So I
guess this is a lich nerf?
2016-11-12 18:44:56 +00:00
Cheridan
b2881af113 Merge pull request #21481 from Arianya/master
Added a shot logging override for kinetic crusher
2016-11-12 10:47:44 -06:00
Cheridan
1fe24d12de Merge pull request #21484 from RemieRichards/FixesSpookyElectricSkeletons
Fixes the Electrocution Animation
2016-11-12 10:19:29 -06:00
Joan Lung
8900804e77 Cogscarabs have a faster proselytizer but are worse at guns 2016-11-12 11:12:44 -05:00
Joan Lung
1663378708 You can no longer pick up cogscarabs 2016-11-12 09:48:48 -05:00
Cheridan
414e5dd19c Merge pull request #21464 from ChangelingRain/positional
Fixes a runtime
2016-11-11 23:00:07 -06:00
Cheridan
0e99bd6100 Merge pull request #21469 from ChangelingRain/pronouns
Couple more pronoun things
2016-11-11 22:33:22 -06:00
Joan Lung
1a608de394 Merge pull request #21453 from KorPhaeron/forcwall
Buffs Forcewall
2016-11-11 14:46:02 -05:00
Remie Richards
3ce0549aa2 Timing system 2016-11-11 19:44:46 +00:00
Joan Lung
8e2e295d91 Merge pull request #21456 from lzimann/watchlist
Adds a button that show all players that are currently connected and in the watchlist
2016-11-11 12:52:11 -05:00
Remie Richards
4ea35965a2 Fixes the Electrocution Animation's skeleton being set to black along with the rest of the mob, causing it to appear invisible. 2016-11-11 16:37:43 +00:00
GunHog
3d7631a559 Move auto-disable to cast line
Will only auto-disable if cast suceeded
2016-11-11 09:33:03 -06:00
GunHog
da18273d8d Wizard Fireball auto-disable
Wizard (and Devil) fireballs now automatically toggle off once fired.
2016-11-11 09:18:51 -06:00
Arianya
29b597f789 Added a logging override for crusher
Consistency with the KA as well as de cluttering logs.
2016-11-11 15:05:15 +00:00
Joan Lung
27cc85535b Merge pull request #21447 from Xhuis/borer_relocation
Moves cortical borer files into the miniantag folder
2016-11-10 19:40:25 -05:00
oranges
b54f7365f2 Merge pull request #21448 from ChangelingRain/deathgasp
Fixes deathgasp and gasping not showing up
2016-11-11 12:53:10 +13:00
Xhuis
3207033001 Relocates borers to the miniantags folder 2016-11-10 18:38:52 -05:00
Joan Lung
fbeb7f958f Couple more pronoun things 2016-11-10 17:29:57 -05:00