Commit Graph

1059 Commits

Author SHA1 Message Date
Meghan-Rossi
efa4d4544b Merge remote-tracking branch 'Meghan-Rossi/master' into job_description_alt 2020-03-04 19:07:37 +00:00
Aronai Sieyes
0dd194e047 Salvageable machines (#6768) 2020-03-03 13:44:31 -08:00
Neerti
24fbd0b87e Half-Refactors Jobs (#6762)
* Somewhat cleans up a piece of job code, makes new ID computers not be awful.

* Changes ROLE_ defines to DEPARTMENT_ to be clearer. Backports the new ID computer's assignment section of its UI to the old ID computer.

* Swaps back to southern cross map.

* Removes a block of commented code.
2020-03-03 13:27:37 -08:00
Mechoid
da67faca4b Prosthetic Expansion Work 2020-03-02 16:20:55 -08:00
Mechoid
69752c1c48 Move Rig modules to more granular files. Add RIG components to robotics mechfab, plus incredibly basic belt-voidsuit RIG. Add Graphite, made by compressing coal, used heavily in RIG components. 2020-03-01 02:41:40 -08:00
Mechoid
7f55089ad4 Brainmechs can use guns again. 2020-02-28 15:20:34 -08:00
Atermonera
37af18b86b Merge pull request #6733 from VOREStation/pol-aitweaks
Readd some AI features and improve AI buildmode
2020-02-26 17:14:50 -08:00
Atermonera
97f8c1d7b4 Merge pull request #6719 from Neerti/feedback_system
Adds an In-game Feedback System
2020-02-24 13:34:27 -08:00
Atermonera
dacf96b2ee Merge pull request #6701 from GeneriedJenelle/patch-1
Hide items in plant pots and plushies
2020-02-24 12:59:33 -08:00
Aronai Sieyes
8e973f5e4e Readd some AI features
Like calling for help and investigating the last known position of enemies
2020-02-23 11:53:55 -05:00
Meghan-Rossi
f29ca2f13e Merge branch 'job_description_alt' into job_description_alt_2 2020-02-22 12:14:56 +00:00
Neerti
556973c9ec Fixes merge conflicts. 2020-02-20 21:59:28 -05:00
Neerti
00b24d93c8 Hopefully finalizes code work. 2020-02-20 21:48:58 -05:00
Heroman
e2e3cfc612 Renames Make All Areas (Un)Powered secret 2020-02-21 06:34:08 +10:00
GeneriedJenelle
178716d38c Update polaris.dme 2020-02-17 16:50:01 +00:00
Atermonera
a862d55fe6 Fixes mining borg ore box movement on sand with a mining satchel equipped (#6693) 2020-02-16 22:17:19 -08:00
Woodratt
512fe09064 2020 Civilian Overhaul
- Added sofas (no options to build one in round yet, will be added after this pull).
- Add neonsigns, currently one neon sign, Cafe. (Code is copy pasta from holosigns).
- Add boxes with mugs and cups.
- Neon signs and holosigns now emit light while on.
- Merged the Coffee Shop with the Library.
- Moved the Locker Room to where the Coffee Shop was, adjusted the holodeck.
- Old Locker Room turned into a construction area.
- Adjusted holodeck maps to new orientation.
- Changed sprite of barcode scanner.
- Cleaned up furniture icon dmi, fixed arm rest icons for shuttle chairs.
2020-02-02 23:58:26 -08:00
ketraiski
31cd94617b Adds a chaos cake 2020-01-15 14:02:10 +01:00
Atermonera
e749b79026 Fixes mech projectile armor thinking test projectiles are dangerous (#6480)
* Fixes mech projectile armor thinking test projectiles are dangerous

* Actually adds some files to polaris.dme
2019-12-21 20:56:24 -08:00
Schnayy
d01f8a4f72 Fixes an oopsie with the library. (#6579)
* Moves custom books to main repo.

* Fixes some oopsie woopsies.

* Another oopsie.
2019-12-20 02:39:34 -08:00
Mechoid
c084b8feae Fixfix 2019-12-15 12:07:55 -08:00
Mechoid
f37b9e592b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into GlobSpecies
# Fix Conflicts:
#	code/modules/mob/living/simple_animal/animals/spiderbot.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	polaris.dme
2019-12-15 12:02:02 -08:00
Atermonera
af301e7b73 Merge pull request #6563 from Novacat/nova-accessory
513 Compatability
2019-12-15 11:47:42 -08:00
Atermonera
59ae4bdb21 Merge pull request #6529 from Meghan-Rossi/animalcleanup
Remove unused simple_animal files
2019-12-15 11:35:57 -08:00
Unknown
505fce3122 Remember the files 2019-12-13 16:04:09 -05:00
Unknown
4caa483e59 Forgot to add to dme 2019-12-12 10:53:35 -05:00
Mechoid
3ec17c4524 No, example map. Not today. 2019-12-05 23:58:28 -08:00
Mechoid
58e2ce2fb4 Change various global species lists to GLOB versions. 2019-12-05 23:55:22 -08:00
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
Meghan-Rossi
82f7e5d4b4 Remove unused simple_animal files
-moves corpse.dm from code\modules\mob\living\simple_animal to code\modules\mob\dead
-deletes folder code\modules\mob\living\simple_animal since none of the other files in it are even included in the dme (we use simple_mob instead)
2019-11-14 19:24:41 +00:00
Mechoid
41fc81e9f0 Setup for New Library (#6514)
* Setup for New Library

* F U C K

* Multipage Huzzah

* FixFix

* Fixfix2Bookboogaloo
2019-11-04 17:24:08 -09: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
GeneriedJenelle
e7ea3a2283 Ports World Server Dialogue/Attack Log Viewer (#6460)
* Ports World Server Dialogue/Attack Log Viewer

Trust me, you didn't know you needed this until you use it.

* Adds to global vars

* Update admin_attack_log.dm

* Update admin_verbs.dm

* Update admin_logs.dm

* Adds verbs for checking player logs

* Update polaris.dme
2019-09-27 23:36:58 -08:00
Atermonera
8ccac5f233 Merge pull request #6459 from Heroman3003/re-sort-ch
Properly sorts all protolathe designs
2019-09-25 22:59:00 -08:00
GeneriedJenelle
7821e7493d Ports Earrings from Baystation (#6444)
* Ports Earrings from Baystation

Ports earrings from baystation.

* Create earrings.dm

* Update loadout_ears.dm

* Fixes everything

* Actually fixes everything because I forgot polaris.dme lmao

* final fix?

Why did I even do this all at work? And this is a friday not a monday!
2019-09-25 13:07:28 -08:00
Heroman3003
453404492e Properly sorts all protolathe designs 2019-09-19 11:24:08 +10: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
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
374900c9a1 Fixfix Map 2019-08-07 20:57:53 -07: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
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
Mechoid
40277238a4 Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my. (#6279)
* Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my.

* Fix processing fuckery.

* Deal with Forever-Seals, and Infini-clamps.

* Update clamp.dm
2019-07-24 00:44:59 -08:00
Atermonera
512c429102 Merge pull request #6290 from Mechoid/SubMunitions
Adds Submunition projectiles, and a laser gun showcasing them.
2019-07-23 19:34:09 -08:00
Atermonera
00bce77d9c Merge pull request #6285 from Mechoid/SLED
Adds the SLED.
2019-07-23 12:20:51 -08:00
Atermonera
887804ea10 Merge pull request #6245 from Ketrai/ROCKSDOJUSTROCK
The great rock update.
2019-07-13 14:21:19 -08:00
Mechoid
3fa77e7848 Adds Submunition projectiles, and a laser gun showcasing them. 2019-07-10 17:13:42 -07:00
Mechoid
ca14b499c9 Adds the SLED. 2019-07-08 22:24:54 -07:00
Atermonera
2b0603faaa Merge pull request #6262 from Mechoid/CivilianExpansion1
Civilian Expansion 1: The Plantening
2019-07-07 13:29:08 -08:00