Commit Graph

5646 Commits

Author SHA1 Message Date
coiax
7e4a0ee0df Adds Romerol (the REAL zombie powder) to uplink (#23369)
* Adds Romerol (the REAL zombie powder) to uplink

🆑 coiax
add: Syndicate agents have gained access to a highly dangerous
experimental bioterror agent, that causes partial reanimation and
aggression after death.
del: Zombie infections are no longer visible on MediHUD.
/🆑

- Adds a reagent to the uplink that gives anyone who injests it a
dormant zombie organ that will reanimate them as a zombie after they
die.
- Initial price estimate is 20TC because this is some fungal TB level
!fun!.
- Good for traitor chefs.
- Zombies are fun, let's have more of them.

* Fixes runtimes, removes airlock tearing

* aGGression

* Update health?

* Zombies are not TOXINLOVERS that's dumb

* Removes from uplink

* Revert "Removes from uplink"

This reverts commit a0acd313929b0787c2eab0d7f289e305212fa0ed.

* 25 TC
2017-01-29 11:21:37 -06:00
coiax
608232d288 Soapstones: Leave messages for the future crew (#23176)
* The beginnings of soapstones

* Compilation

* Sprites!

* White text

* Persistence

* More tweaks

* Why isn't it working

* Removes author name

* Random names, more checking for nulls

* VARIABLE MESSAGES

* Fixes icon conflicts

* Limited soapstone uses, purchase more at cargo

* No carving if empty
2017-01-28 17:48:55 +01:00
Haevacht
a711382291 Replaces a binary OR with a proper one (#23409)
* Replaces a binary OR with a proper one

* less ()s
2017-01-28 11:53:14 -02:00
Christopher
8a31b38635 When wetting mop from janitorial cart mop will no longer try and mop the floor under the janitorial cart. (#23345) 2017-01-28 01:13:31 -06:00
Core0verload
4424fb2f2a Fixes reagent ID being displayed as blood type (#23379) 2017-01-28 01:09:42 -06:00
Cheridan
c9fad927a9 Merge pull request #23245 from ChangelingRain/windowdressing
You can no longer stack multiple windows of the same direction on a tile
2017-01-27 17:27:25 -06:00
AnturK
e6169e8d42 Minor AI fixes. (#23105)
* Fixes #20469

* Fixes #9062 again.

* Fixes #10283
Laws above 20 will replace laws of same or lower importance.
2017-01-26 19:40:45 -06:00
Joan Lung
214172781b Merge pull request #23333 from SweaterKittens/Man_on_Fire
Updates Names and Descriptions for Plasmamen-related Items
2017-01-26 19:56:09 -05:00
coiax
338e67808e You can now buy telecrystals in stacks of 5 and 20 (#22818)
🆑 coiax
add: Telecrystals can be purchased in stacks of five and twenty.
add: The entire stack of telecrystals are added to the uplink when
charging them.
/🆑
2017-01-26 13:37:22 +01:00
SweaterKittens
11d2b5c417 Updated names and desc for all Plasmamen related items, including the jumpsuit, helmet, formerly used suit (Now EVA suit), internals tank, and suit extinguisher refills. 2017-01-25 12:07:11 -08:00
Cyberboss
5959ac32cc Refactors atom/Initialize. Fixes ruins being initialized twice (#22778)
* Refactors atom/Initialize

Captialized for compiling correctness and to be more inline with Destroy

Will now be called from atom/New if the world initialization loop in SSobj has already run. Should always call the base.

Now comes with the `roundstart` parameter indicating whether or not it was called by SSobj or atom/New

Other fixes/tweaks:
- Renamed a proc called Initialize in abduction consoles to Setup
- Removed /obj/item/device/radio/headset/headset_sec/department: Broken and referenced literally nowhere in the code
- Removed a spawn from the Initialize of turbine_computer which made literally zero sense
- Generalized the proc which fixes RND servers with no id set

Reasoning: It's better to check roundstart per function than to have to duplicate code in New and Initialize. Think of it as a safer New for atoms. If we move enough stuff to it, initial map load performance will increase due to less New calls

* Fixed a thing

* Actually, fuck the police

* >Expecting a merge without errors

* >Not calling ..() in New

* Sanic

* Fix the headset bug

* Makes sure the map loaders dew it right

* Fixes ruins being initialized twice

* Rename roundstart -> mapload

* Revert "Rename roundstart -> mapload"

This reverts commit 667c327fd2ccfa3ce4f4db52eac03f9e8b0f6812.

* Remove unrelated change

* A more direct solution to map loads

* And now we shouldnt need this warning

* Add the new var to SSobj recovery

* Revert "Revert "Rename roundstart -> mapload""

This reverts commit dee07dbd5e4696554ac43aae5b91cce743b9b9e0.

* Line endings
2017-01-23 09:37:45 +01:00
Kyle Spier-Swenson
12570805bd Closes the Pool. (#23150)
* Delete pool.dm

* Removes usage of PoolOrNew

* Wrap up
2017-01-22 16:00:23 -05:00
Joan Lung
0633e79042 You can no longer stack multiple windows of the same dir on a tile 2017-01-22 13:43:39 -05:00
Kyle Spier-Swenson
c341178ff4 Fixes bug with addtimer keeping old timers around, makes addtimer even faster. (#23126)
* Fixes timers being left around, Makes addtimer() sanic fast.

This adds a new flag, TIMER_STOPPABLE. Most(80%) of the overhead for addtimer() was in adding the timer to the associated lookup list for deltimer() to use. Moving that functionality to a flag so it wouldn't slow down the 70% of things calling timers puts the final nail in the coffin of byond's sleep/spawn().

spawn: 324 seconds across 5,948,372 calls

addtimer: 67 seconds across 5,953,220 calls

The testing setup for profiling was included in this commit, it will be removed in a later commit. @Fox-McCloud

* Remove profiling procs.

* fix runtime

luckly when this happened, we were about to resume anyways.
2017-01-20 09:31:50 +01:00
Cheridan
b47ec35ee9 Merge pull request #23068 from kevinz000/patch-34
Fixes lollipops triggering weldertank explosions
2017-01-18 14:14:36 -06:00
Joan Lung
27a54d16ff Merge pull request #23051 from Core0verload/defib_fix
Fixes defibrillators
2017-01-17 18:42:57 -05:00
kevinz000
08fe5ee84b Update robot_items.dm 2017-01-16 19:59:34 -08:00
c0
4989e12b45 Fixes defibs 2017-01-16 11:47:18 +03:00
oranges
3ac94a85cc Merge pull request #22994 from XDTM/ChameleonPdaNowUseful
PDA can update their name when an agent id is inside
2017-01-16 20:58:54 +13:00
kevinz000
646bb99b99 Lessens spray can spam (#22970)
* Update crayons.dm

* Update crayons.dm
2017-01-14 11:55:35 +13:00
oranges
ddb4b89619 Merge pull request #22968 from XDTM/LargeSlime
Fixes large grenade interaction with slime cores
2017-01-14 11:55:10 +13:00
johnthedonut
c5d9bb4588 Fixes wetting a mop with a bucket so it wont clean the tile you are standing on. 2017-01-13 22:16:51 +01:00
XDTM
9dd8ff7934 Fixes extinguisher violence (#22928) 2017-01-13 22:14:27 +01:00
XDTM
30bfe13f81 Makes agent ids change name 2017-01-13 22:10:52 +01:00
Thunder12345
d56b3f469c Shield overlays from shielded hardsuits and nullrod staffs (#22940) 2017-01-12 15:09:25 -05:00
XDTM
e8e7af2fc8 Fixes bad message (#22966) 2017-01-12 15:05:02 -05:00
XDTM
44bc3b6cf5 Fixes large grenade interaction with slime cores 2017-01-12 12:25:05 +01:00
oranges
f4e325e5ed Merge pull request #22765 from Mervill/the_kilt_is_now_op
Hardsuits, amour and other suits that cover the feet now protect against glass shards
2017-01-12 13:54:32 +13:00
XDTM
64e4994fea Fixes material amount (#22954) 2017-01-11 19:51:13 -05:00
kevinz000
0601f1f0f6 Update twohanded.dm (#22904) 2017-01-11 19:49:42 -05:00
oranges
41a6efd987 Revert "Fixes instant summons and probably a few other edge cases" (#22917) 2017-01-10 20:55:26 -05:00
Joan Lung
75999e1c6c Fixes instant summons and probably a few other edge cases (#22890)
* Fixes instant summons and probably a few other edge cases

* woken in a fog don't sweat it
and reckon none of it had come from you

* echo

* no lesson in magic, just untimely dreams

* slapdash code queen
2017-01-11 12:53:05 +13:00
oranges
3ad35c23ab Merge pull request #22869 from Cyberboss/ReagentsShouldNotBeLeftNull
Moves reagents back into atoms. Fixes confusion between reagents/reagents_list
2017-01-11 12:49:02 +13:00
Haevacht
6adb35f57e Should fix the crusher, again, and the offhand runtime (#22836)
* This shouldn;t autoPR.

* should probably use it properly eh

* Update twohanded.dm

* Reeeeeeeeeeeeeeeeeeeeeeeeeeeee.

* 2 less lines, yay for OR
2017-01-10 15:00:20 +13:00
oranges
f79476634c Merge pull request #22829 from ChangelingRain/blockedturffix
Fixes a few things considering turfs 'blocked' by a mob
2017-01-10 09:57:43 +13:00
oranges
8af3b6c975 Merge pull request #22828 from KorPhaeron/axe
Fixes energy axe not having the sharp flag
2017-01-10 09:57:20 +13:00
Cyberboss
6e622eedd1 Moves reagents into atoms 2017-01-08 23:02:37 -05:00
Joan Lung
1f85d27652 Fixes a few things considering turfs 'blocked' by a mob 2017-01-07 17:58:51 -05:00
KorPhaeron
dbf01363b9 Energy Axe can dismember 2017-01-07 14:19:18 -06:00
bgobandit
fbf5c902f6 spelling issues too how quaint 2017-01-07 12:53:27 -05:00
Trugath
4105ca9ea6 Tgmonkey (#22338)
* Monkeys are a bit more of a handful
They will aggro, steal, pick up weapons and stuff bodies in disposals

* search using held_items instead of manually

* Only natural monkies should reliably stun
Natural monkies don't try to stun-lock

* Pushes equip_in_one_of_slots to carbon from human

* Removed unused helper.

* Make the trip and stun only against monkeys
The main reason this is here is for the swarm behaivour.

* Just return true for now. It should flee on next life tick.

* remove blocking call from Life

* stuff_mob_in blocks so make it non-blocking

* add check to stop add/remove in same function
Only occours if the monkey attacks someone who isn't in the enemies list.
This only happens during a monkey swarm. Best to check.

* Fix for monkeys ripping stuff off walls.

* Moved shared emote/weaken down into living
Called the new function knockOVer. Monkey and Secbot both have different
control flow before the shared code.

* Stop monkeys fighting over body

* Remove commented out code

* Reduce flee range

* replace spawn with addTimer by moving code into callbacks

* Move magic numbers to defines
Also removed 900 delay in resisting cuffs as its a useless argument

* Refactor. Attacking has a function: monkey_attack
Combined de-aggro into it

* rework monkeyDrop to force drop
Also check for deleted items when snatching items

* Aggresive can be toggled by an admin
Allows for a mass mob of angry monkies

* Tweak aggressive monkeys to attack each other less
Monkey vs Monkey probability is a define
Warning: Once MVM combat breaks out in large mobs, mayhem insues

* Set the monkey back to idle once it attemps to dispose the body

* fix for aggressive monkeys self-harming

* comment wording fix

* changed walk2derpless to a callback and fixed deathgrip
2017-01-06 14:59:37 +01:00
oranges
b32061ea37 Merge pull request #22727 from XDTM/PocketShoes
Fixes storage pockets preventing the use of items on the clothing item
2017-01-06 09:57:45 +13:00
Haevacht
044adf9446 Fixes the crusher, and future twohands required items, equipping to slots (#22712)
* If plants have slotflags they can now be equipped

* now you can have more than one slot_flag
2017-01-06 09:54:50 +13:00
Mervill
646d4bc8ee hardsuits, amour and other suits that cover the feet now protect against glass shards 2017-01-05 02:48:40 -08:00
oranges
f21b077adc Merge pull request #22698 from ChangelingRain/supermattercount
The supermatter now has a ghost-visible damage display
2017-01-05 19:09:28 +13:00
CPTANT
a60172ecf5 Rebalances matter cartridge cost (#22687)
* fixes blocks being applied twice

* revert

* Rebalances matter cartridge cost to prevent material duplication
2017-01-05 19:07:08 +13:00
Haevacht
2e93eeea51 Offhand backup plan (#22679)
* no longer asks the offhand to neatly unwield

should fix the issues??

* re-callbacks the sky bulge

* revert the qdel
2017-01-05 19:05:25 +13:00
XDTM
397f440e10 Fixes pockets 2017-01-04 15:18:16 +01:00
Firecage
50bbf5aa50 Allows syringes and droppers to show their reagents when examined while wearing things such as Science Goggles. (#22618)
* Allows syringes and droppers to show their reagents when examined.

* rearranges my logic

* replaces SEMIOPENCONTAINER with TRANSPARENT

* Silly spelling error fix.

* Moves the defines from flags to container_type to avoid issues with conflicting flags

* changes it back to obj/item/O

* Moves the OPENCONTAINER and TRANSPARENT defines to the reagents.dm
2017-01-04 20:00:46 +13:00
Mervill
422d869a40 [s] Fixes spraycans being silent (#22682)
* The regular spraycan makes noise again, also spraying someone in the face is loud

* There are more then 80 columns in the world today, friends
2017-01-04 19:42:39 +13:00