Commit Graph

2891 Commits

Author SHA1 Message Date
Mechoid 7ecdcb40d2 Security / PseudoCargo Expansion (#6482)
* Security Expansion work.

* Weaponized Racism, Stowaways, Meteors

* Fix Fix. Prep modular armor for addition.

* Fix the boots.

* More modular armor work. Now in cargo!

* Fixfix

* Fixfix

* Thank you anxiety very cool.

* Make a Stowaway Antag

* FixFix
2019-11-24 17:22:25 -05:00
lolman360 18c8ed589b Sharpening kits. (#6501)
* one

* rtwo

* image

* Update material_weapons.dm
2019-11-04 17:43:49 -09:00
lolman360 6853419c57 [READY] Recolourable energy weapons. (#6507) 2019-11-01 08:37:27 -08:00
KasparoVy a75c92c03f Loadout Implants Properly go in Mob, not on Floor
The main cause is the 'exploitable' check from `code/game/jobs/job_controller.dm` because the proc `amend_exploitable` from `code/modules/mob/mob.dm` spawns a duplicate of the implant at the mob's feet.

Tertiary issues were...
- The `implant_loadout` proc in `code/game/objects/items/weapons/implants/implant.dm` not inserting the implant in the correct location (was passing an organ instead of a zone define like BP_HEAD, which has a string value of "head".)
- There were unnecessary post-spawn behaviours for dud and neural fluff implants.

What now happens:
- The exploitable check now occurs in the `spawn_item` proc from `code/modules/client/preference_setup/loadout/loadout.dm`.
- The loadout implants are now inserted into the correct locations within a mob.
- There won't be implants created on the floor anymore.
2019-10-27 22:43:27 -04:00
Cerebulon d47130bf3c ERT Rangers Costumes (#6493)
* Sprites

* and code fuckit
2019-10-25 12:06:18 -07:00
Atermonera dba1abbcc8 Shards only do damage if you hit things with them (#6478) 2019-10-20 14:54:30 -07:00
Mechoid e2e870f2b4 Medical Expansion (#6465)
* Starts work on the Medical Expansion.

* Further Work

* Save Everything!

* Large volume of things.

* Log of Change

* I'm an idiot.

* Kidney assisted sprites. They didn't exist, for some reason.

* Fixfix

* Fixfix

* Update encased.dm

* Update glass.dm

* Update Chemistry-Reagents.dm

I am once more an idiot.

* Split augs.

* Fixfix
2019-10-19 19:27:39 -08:00
Unknown 7f4b35580d Blind port of Bay Radiation Subsystem
Figured I would do my part to move everything over to subsystems. Not tested yet.
2019-09-30 23:59:31 -04:00
Novacat 7f49c680e5 Ports MREs from Baystation (#6424)
* Ports MREs from Baystation

- Ports MREs from Baystation
- Adds an 'Emergency ration' that contains liquidfood rations
- Two new ration packs that have the new rations.

* Placates travis

* Lynxlog

* Adds liquidprotein rations

* Sacrifice for travis

* Changes desc

* Fixing missing filling in crayon paste

* Fixes missing side for random rations

* Renames Paste Supplypack

* aaaaa minor error

* Slight organization

* Fixes some errors

* Why am I like this
2019-08-31 14:00:14 -08:00
Anewbe 9b5573eee6 Merge pull request #6429 from Heroman3003/idfix
Fixes editing colony director IDs editing global 'station access' list
2019-08-29 17:26:45 -05:00
Heroman c1ec00ef62 Undoes unnecesary Copy() 2019-08-28 19:03:01 +10:00
Heroman daadfd6a72 Fixes editing colony director IDs editing global 'station access' list 2019-08-28 19:02:35 +10:00
Atermonera 8f85cb4387 Merge pull request #6418 from MisterLayne/glass_shard_self_harm
Shards Do Damage to Holder
2019-08-27 21:23:52 -08:00
MisterLayne e892f25e3d F i n a l l y. 2019-08-26 09:55:59 -04:00
MisterLayne 5a21f6dc57 Still complete garbage. 2019-08-23 14:35:20 -04:00
MisterLayne 382f04898a A mangled and unfinished shitstorm of code. 2019-08-23 14:26:44 -04:00
MisterLayne 7d4c49f45e Praise limb-stump jesus! 2019-08-22 10:37:23 -04:00
Atermonera 0069b9d980 Merge pull request #6396 from Mechoid/ChemistryAdvancement
Chemistry Expansion
2019-08-21 13:42:08 -08:00
Mechoid f294be6c56 Exploration Expansion 1: Or, How I Learned To Love The Tree (#6358)
* Mechoid code everything!

* Telecube

* Adds 2 PoIs

* H u g e commit.
2019-08-21 13:21:33 -08:00
Mechoid c462448da8 Introduce the Distillery, a few recipes, and new chemicals. Introduce chemical patches, which apply on-touch chemicals, and can be dissolved a la pills. 2019-08-07 20:49:24 -07:00
Nalarac 88e79b30c5 Adds NOCONDUCT to Some Items 2019-08-07 09:46:39 -05:00
Anewbe bb4988e3e6 Merge pull request #6359 from Nalarac/patch-5
Updates Supermatter Guide Book
2019-08-02 13:05:36 -05:00
Atermonera da7ced30b9 Merge pull request #6328 from Nalarac/recharger
Makes Heavy-Duty Cell Chargers Constructable
2019-07-30 16:18:09 -08:00
Atermonera 5e38b8e401 Adds shutoff valve monitor (#6353)
* Adds shutoff valve monitor

* uses the other half of the mapmerger, hopefully appeases travis (it probably won't)
2019-07-30 17:03:28 -07:00
Andrew 2a2dc777fb Updates Supermatter Guide Book
Gives a more detailed outline on starting the engine and corrects outdated content.
Gives step in ejection procedure to check engine room power.
Suggests adding more gas in  emergency cooling procedure.
Maintains that nitrogen is standard, but removes suggestions that phoron is harmful in the reactor loop.
Replaces "Air" with "Gas" as air suggests standard atmosphere.
2019-07-30 15:06:42 -05:00
Nalarac 5cda8072b7 Fixes Robots putting things in rechargers 2019-07-27 14:53:08 -05:00
Nalarac 4490e5b42a Makes Heavy-Duty Cell Chargers Constructable
Fixes robots being unable to upgrade regular (and wall) rechargers.

The heavy-duty cell recharger is constructed the same way as the regular recharger (with a unique frame).

The heavy-duty recharger can now be upgraded like the standard rechargers.
2019-07-23 12:11:08 -05:00
Mechoid 90f8ca9f0d Mining Expansion, the Diggening. 2019-07-06 21:18:31 -07:00
mistyLuminescence 2ec54f0151 Adds two new Cargo crates! (#6194)
* Adds 2 new cargo crates
2019-06-29 16:45:46 -07:00
mistyLuminescence b2e47ee215 Serenity (#6208)
* Serenity

* travis

* adminspawn

* I greatly appreciate all detailed and informative feedback provided. Per request, the Serenity is currently adminspawn-only; a new PR will be made in two weeks to add it to Robotics and resolve any issues encountered during the testing period.

* Comments out circuit for two-week testing period
2019-06-20 23:12:37 -05:00
Mechoid 8bce9db1e8 THIS PR IS 7+ DAYS OLD, SEE #6203 . Energy-Swords and Changeling Melee Weapons Can Deflect Projectiles (#6215)
* MakeMeleeGreatAgain

* Where is melee defined?!
2019-06-18 04:50:47 -05:00
Novacat 5b18382ca6 Grey scale pills and colored pillbottles (#6199)
* Grey scale pills and colored pillbottles

Baystation ports of PR #19714 and PR #21578

Known issue: The Chem master's pill selection does not properly show the grey scale pills, unfortunately. There is a 'close enough' approximation, however.

* Minor oversights

* Another oversight

* Programming language confusion

* Corrects some code
2019-06-16 20:28:02 -05:00
Ketrai 2759198226 fixes a tiny pathing error 2019-06-08 19:55:31 +02:00
Ketrai ea5c1393bf Fixes a tiny path error. 2019-06-07 20:08:05 +02:00
Ketrai d891fa2836 Adds worms 2019-06-07 19:55:03 +02:00
Atermonera f4cbeb6572 Merge pull request #6172 from mistyLuminescence/contacts
Makeover Kit
2019-05-28 09:09:12 -08:00
mistyLuminescence 209cb3624c Big Bugfix Bonanza (#6170)
* Big Bugfix Bonanza

* changelog

* deunifies the Unity

* fixes changelog

* 60 is bigger than 50
2019-05-23 09:58:29 -07:00
if there were two guys on the moon 19d5bece10 makeover 2019-05-22 18:36:12 +01:00
Sebbe b33cc0f644 Lets you put the holowarrant thingie in belts 2019-05-15 13:01:47 +02:00
Unknown d4c0dd5d69 Merge remote-tracking branch 'PolarisSS13/master' into spriteadd 2019-04-22 20:20:56 -04:00
Atermonera d8b2c0f33a Merge pull request #6102 from Heroman3003/taping-it-all-up
Fixes taperolls not being usable on tiles with directional windows
2019-04-20 16:27:21 -08:00
Heroman cdf63b7747 Fixes police tape not appearing right when used without moving 2019-04-19 05:10:34 +10:00
Atermonera bcdb825ddb Merge pull request #6106 from chaoko99/Pullbox
ore bags will now automatically pick up ore and dump them into a box if one is being pulled.
2019-04-18 09:18:32 -08:00
Mechoid 13db58a51c Adds Robobags (#6059)
* Adds Robobags

* Finishes robobags

* FixFix
2019-04-17 21:39:36 -08:00
Atermonera 24b2df4b9b Merge pull request #6026 from Mechoid/Precursotech_Janus
Precursotech Janus
2019-04-17 20:32:14 -08:00
chaoko99 1306f187e8 ore bags will now automatically pick up ore and dump them into a box if one is being pulled. 2019-04-16 21:01:41 -07:00
Heroman3003 66cada73d2 Makes taperolls usable on tiles with directional windows 2019-04-17 11:37:51 +10:00
Heroman3003 9dbedbd876 Fixes self-refueling welders starting fires when off 2019-04-15 10:37:50 +10:00
Mechoid 8211101bf3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Precursotech_Janus 2019-04-13 22:22:17 -07:00
Mechoid d52be5331b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Precursotech_Tools 2019-04-13 22:21:38 -07:00