Commit Graph

8277 Commits

Author SHA1 Message Date
Tlaltecuhtli
7cbcd2ff3c adds medipen refiller machine (#49172)
* 1

* Update machine_designs.dm

* 2

* clean up

* more clean up

*  🍆🍆🍆🍆🍆🍆🍆🍆🍆🍆🍆🍆🍆🍆

* Update code/game/machinery/medipen_refiller.dm

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-02-12 18:48:19 -05:00
itseasytosee
870a6e5bbd [READY] Omega soap (#49265)
* Omega soap

* Update code/game/objects/items/clown_items.dm

Co-Authored-By: swindly <swindly_tg13@aol.com>

Co-authored-by: swindly <swindly_tg13@aol.com>
2020-02-10 20:03:29 +01:00
Nick
02d4a9b8a8 Adds chameleon belt to cham kit (#49175)
* Update uplink_kits.dm

* sourc
2020-02-08 20:52:53 -05:00
Bokkiewokkie
bbb7f93c19 Adds missing box sprites and reworks some ammo boxes (#49057)
* Boxes

box images

* Aligned some box icons to box

and added secbox box to some security boxes.

* More Boxes

now available in medical, science and cargo!

* New shotgun and foam gun ammo boxes

and removed the medbox, scibox and cargo boxes since I think they should probably have their own pr.

* removed a thing

removes the mention of the sci, med and cargoboxes

* Removed the _old ammo box sprites

I mean it does what it says on the tin
2020-02-08 20:48:14 -05:00
Jordan Brown
d69cb0e34d Merge pull request #49188 from JJRcop/defib_nanites_check
Defib and Nanite Defib use the same can_defib proc
2020-02-08 15:09:39 -05:00
imsxz
ab4155e3d7 skateboard auto buckle (#49204) 2020-02-08 15:08:36 -05:00
Jonathan (JJRcop) Rubenstein
3b1b4c293a Move can_defib proc to carbon 2020-02-07 18:02:30 -05:00
Fikou
8deeceefb6 [READY] Adds rideable Goliaths (#49003)
* adds rideable goliaths

* stamding on the emdge

* plems work

* this should be it

* FUCK YOU TRAVIS

* primal friendly

* ok athath buddy

* mmm grayons

* sprite gang

* placeholder sprite, works till someone makes a new one maybe haha

* lets do this

* An object tames a monstrous beast somehow. More news at 5.
2020-02-07 17:00:07 +01:00
cacogen
9436ed69a8 Makes abductor baton child of stun baton (#48766)
* Makes abductor baton child of stun baton


- Clarify var names and reorder vars in baton defines
- Slightly simplify active baton wash code

* forget about ()
2020-02-07 14:53:14 +01:00
ArcaneMusic
38a675b544 [READY]Adds a new minor reward to the BEPIS, Party Pods. (#48654)
* Initial commit, adding to minor techs after

* Adjusts window size, adds as a minor reward.

* english good me do

* I swear, really officer, I'm not drunk, I just can't type

* Alright fine maybe I should sleep

* FINE we'll go with this. I legitimately don't even drink

* Alright this clearly isn't working yet.

* Fixes touch reagents, and gives lead acetate some real-life symptoms thanks EOB

* _Perfection_

* Nobody told me I was conflict with my own file!

* Allows for touch reactions in a slightly more sane way. Hopefully.

* alright holup

* Minor minor change to the UI so that the menu doesn't clip anymore, swapped for the other barber's aid.

* Hairgrowth works now

* Fixes merge conflicts?
2020-02-07 14:52:29 +01:00
skoglol
a28b24f149 Completely removes cloning (#48668)
* Removed from code

* Removes cloners from maps

* Some more references, now compiles.

* Reduces availability of replica pods

* DNA scanner and tech disk rebranding

* pubby door name, cargo pack description
2020-02-04 16:04:06 -05:00
skoglol
c44e913803 Some more cloning prep stuff (#49090)
* defib texts improved, now gives a little guidance.

* Removes the superfluous braindeath

* Organ repair surgeries now repeatable

* Death info message

* Reverts repeatables, improves brain repeatable

* defib more forceful, better brain messages, better mannitol healing.

* OR

* Update code/modules/surgery/brain_surgery.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-02-04 13:50:56 -05:00
Jordan Brown
ce9577663a Merge pull request #49173 from ninjanomnom/material-lazy-init
Makes the global materials lookup lazily initialized
2020-02-04 11:05:59 -05:00
ShizCalev
6c20da6b66 Fixes spellbooks becoming unreadable if the mob moves (#49139) 2020-02-04 07:27:43 +01:00
itseasytosee
0837547ff9 Adds 3 new toys to the prize pool not removing all of science edition. (#49122)
* creative

* God damn it Travis

* Trick blindfold looks like a blindfold at first glance
2020-02-04 07:07:14 +01:00
cacogen
bbdb22a346 Improves cyberimplant readout (#49087) 2020-02-04 06:58:11 +01:00
Emmett Gaines
2cf7728494 Removes the bitflag helpers (#49106) 2020-02-03 16:26:00 -05:00
skoglol
a97b90bc3f Slight adrenal buffs (#49140) 2020-02-03 12:23:46 -05:00
Emmett Gaines
ab3a127295 Makes the global materials lookup lazily initialized 2020-02-03 10:17:13 -05:00
zxaber
79e59077eb Allows defib units to be used as medical borg upgrades, adds message to borgs when they recieve an upgrade, re-organizes borg attackby(). (#48805)
* Delete stale.yml

* Create stale.yml

* clear

* Can now replace the defib pack with an upgrade card to get the pack back.

* less redundant checks

* borg > cyborg text changes
2020-02-02 22:08:40 -05:00
MrPerson
12eecfd181 Makes raw HTML and browser datum popups UTF-8 aware (#49066)
* Makes raw HTML and browser datum popups UTF-8 aware

Admin menus specifically really shouldn't break just because you named some guy "☺s the Clown"

* Fixed new_player.dm

* Fucking filing cabinets
2020-02-01 22:14:31 +01:00
AnturK
4fbf5b8118 Fixes pda manifest (#49115) 2020-02-01 04:42:51 -08:00
blessedmulligan
54dc879f19 Cyborg spin throwing now depends on intent (#48891)
Trying this again. When *spin-ing as a cyborg, the way mobs are thrown off you depends on your intent. On help intent, they will be thrown a shorter distance from you and will never be damaged or stunned (they will still be knocked down). On harm intent, they will be thrown the current distance and will be damaged and stunned if they hit a wall or another person.

WHAT THIS ACTUALLY CHANGES:
Currently, whether or not *spin-ing will actually hurt/stun someone depends on whether or not the *spin-ing borg is emagged. This PR also reduces the range of the help intent throw, but since the knockdown happens whether or not the thrown mob hits something this is in most circumstances a cosmetic change. So, in summary, if you are a non-emagged borg in help intent the only thing this changes is you will chuck people a slightly shorter distance.
Why It's Good For The Game

This isn't exactly the most important change, but a borg should be able to control their behavior. Having damage/stun from throwing determined solely by emag-ness seems more like a hacky kludge than a legitimate design choice. Also, having the behavior of borg-throwing determined in the code for carbons is messy.
Changelog

🆑
add: The behavior of cyborg's *spin emote now changes with intent; on harm intent, it will throw its passenger farther and damage and stun them if they hit a wall or another person.
/🆑
2020-02-01 20:30:57 +13:00
81Denton
3f694a598e Merge pull request #48919 from cacogen/pubbywayfinderbeacons
Pubby wayfinding beacons
2020-02-01 08:10:59 +01:00
AffectedArc07
6f5c638764 Adds a not garbage PDA manifest (#48915) 2020-01-28 18:31:36 -05:00
skoglol
398bbdbbec Removes dorms toolboxes, tool storage insuls and multitools. (#48856)
* Replaces tool storage insulated gloves with budgets.

* Removes multitools, dorms toolboxes

* Adds multitools to youtool premium
2020-01-28 18:06:58 -05:00
fluffe9911
00043330a0 New King Goat Lavaland Boss! (#48823)
About The Pull Request

This pr adds in a new lavaland boss in a seperate z level arena also included are goat plushies that ram into people and goat skins which you get by butchering goats and can wear on your head, a goat gun that shoots goats and finally multiple tweaks/fixes generally involving possible ways to teleport out of noteleport area and or cheese the king goat.
Why It's Good For The Game

Lavaland has not seen any new bosses for a long bloody time and although the boss may be a bit silly I feel more hardcore players will enjoy the challenge it brings since this is meant to be a very hard boss also new goat related items are always neat.

🆑 Fluffe9911 for porting/making most of it, Monster and Sabiran for the King Goat!
add: A new king goat lavaland boss!
add: Goats now drop skin which you can wear on your head! (coder sprite)
add: Goat themed plushies that ram people! (realistic version sprite by identification code by karma)
/🆑

goat

This is ported over from my work on yogstation with minor changes mostly to make things work there is more goat content I made but didnt wanna do too much at once and dont know if tg would like it
2020-01-29 11:50:27 +13:00
ShizCalev
f044bc1d70 Merge pull request #49052 from MrPerson/agent_cards_were_broken_and_nobody_cares_because_they_suck
Fixes Agent ID naming
2020-01-28 04:54:39 -05:00
ShizCalev
4c3a23bf52 Merge pull request #49034 from Names-Are-Hard/pai-law-fix
Fixes setting pAI laws
2020-01-28 04:50:51 -05:00
MrPerson
fbe82deca5 Fixes Agent ID naming
Fixes #49022

I botched a merge confict on this and broke it, my bad
2020-01-27 18:51:01 -06:00
spookydonut
ac7f2b5166 Fix Crossed/Entered/Exited/Bump/ui_act parameter casting (#49016)
About The Pull Request

Detected as part of my work on SpaceManiac/SpacemanDMM#167
2020-01-28 10:51:15 +13:00
AnturK
c21867735d Merge pull request #49013 from rdragan/wallet
Fixes wallet icons
2020-01-27 11:42:30 +01:00
Tlaltecuhtli
d29d87630c adds constable outfit in cargocrate (#48748)
🆑
add: contraband crate with british police outfit
/🆑
why is it good for gaming:
now they can buy thematic items and sec can do fun rp

description of what is added:
items added in the security vendor:
an hat with same properties of the helmet
a suit with same properties of normal sec suit for
a whistle with 10s cooldown
a pair of white gloves
a conversion kit which can turn a stun baton in a crappier police baton (no free batons and no "upgraded versions*")
for 1100 credits

prices are so sec can buy the whole reskin kit within 20 minutes of the round

tl note: police baton is more garbage than the roundstart free sec baton its for thematic rp
2020-01-27 23:41:40 +13:00
thebleh
ea9dc6082b update implantcase icons on initialize (#48984) 2020-01-27 11:26:25 +01:00
Names Are Hard
1ab54b76fe Fixes things 2020-01-26 21:53:32 -08:00
Arkatos1
36dc328b4d Fix trashbag icons when emptying (#49001)
Trashbag will now properly update its icon state upon emptying or 
filling it with content.
2020-01-26 16:24:33 -08:00
Radu Dragan
52f7031c86 remove caching from wallet update_overlays() 2020-01-26 02:53:15 +02:00
AnturK
b04934a0d1 Fixes runtimes & some cleanup (#48776)
* Keyless emote sanity.

* Camera bug runtime

* SM runtime

* Removes random <br>'s in atmos logs

* light spark runtime

* uranium splashing on walls runtime

* throwing clown with clown shoes runtime.

* beam rifle runtime

* Don't warn on mesageless keyless emotes.

* Fixup
2020-01-24 13:23:59 -05:00
Fikou
c0b821e24e adds canvases to cloth recipes (#48952) 2020-01-24 11:25:44 -05:00
Rohesie
7bef84f009 Mass-replacement of stat to machine_stat (#48758)
Living and machine stat vars are pretty different, one uses flags and other number-defines.
This should make some other mass-replacements and searches a bit easier.
2020-01-24 12:37:17 +13:00
ArcaneMusic
b62d105228 Adds the Wood Datum Material, giving it to items made from wood. (#48820)
* Initial commit, wood datum mat. Works on my machine.

* Wait this makes baseball bats worthless nevermind

* Review changes, uses the define now, just don't know how bitflags work well enough for that other bit

* Adds the material dependance check

* FINE
2020-01-23 17:36:10 -05:00
kevinz000
e8b8894efc Update robot_items.dm (#48930) 2020-01-23 09:29:15 -05:00
spookydonut
ce339bd7d9 removes some new unreachable code (#48907) 2020-01-22 12:52:34 -05:00
MrPerson
26093e5ac2 Further update_icon splitup (#48784)
* Further update_icon splitup

After this there'll be just under 100 old update_icon() calls that need fixing.

* Thanks Travis
2020-01-22 10:18:05 -05:00
QualityVan
87eaa8c578 Smoking kills (#48824)
* Smoking slowly damages lungs

* slightly higher

* damage lowered, none to mechanical organs
2020-01-21 10:44:10 -05:00
cacogen
7799aea4ea Pubby wayfinding beacons 2020-01-21 14:23:20 +13:00
skoglol
38f5a94715 Merge pull request #48670 from ExcessiveUseOfCobblestone/the-man-who-has-it-all
The Janitor Strikes Back: Scrubbing (Cleaning) Skill / `remove_any` proc granularity change
2020-01-20 10:17:28 +01:00
moo
05a9fdd56c Apply suggestions from code review 2020-01-20 00:40:13 -05:00
AnturK
bc7ea709c5 Canvas Refactor (#48834)
* Canvas Refactor

* tgui review stuff
2020-01-19 11:14:05 -05:00
Nick
d84576f1ed Add a sprite for the wayfinding pinpointer (#48750)
I hate confusing it for a crew pinpointer. So have a boring grey 
recolered crew pinpointer. Grey for the balds for dress in grey that 
need to learn the map.
2020-01-18 22:42:26 -08:00