Commit Graph

11684 Commits

Author SHA1 Message Date
EmperorJon
8af283c7a3 Merge pull request #1569 from Mark9013100/5/6/2016camera_edits
Security Camera edits
2016-05-07 00:35:36 +01:00
EmperorJon
e67e2caa48 Merge pull request #1577 from redstryker/master
Changes all references to 'Mars University' from 'Mars University' to 'Mojave University'
2016-05-07 00:35:10 +01:00
Datraen
5cc027aacf Merge pull request #1536 from Yoshax/roboticsandcells
Remaps robotics and mechbay slightly, other adjusts and adjusts cell charge rate
2016-05-06 18:46:53 -04:00
redstryker
ff361c2023 Changes all references to 'Mars University' to 'Mojave University' 2016-05-06 18:23:40 -04:00
Yoshax
52d73dbf80 Makes drinking glasses produceable in autolathes 2016-05-06 22:51:18 +01:00
Mark9013100
7efe14a34d Security Camera edits 2016-05-06 14:27:12 -04:00
Yoshax
47508187cc Makes smoke grenades last longer and adjusts checks
- Changes boxes of smokes from 5 to 7 grenades
- Changes mapped in single smoke grenades to boxes
2016-05-06 17:25:28 +01:00
SinTwo
337e49fdc3 Fixes sleepers and advanced body scanners spitting out their parts. 2016-05-05 15:36:45 -04:00
Datraen
44edf86ccb Merge pull request #1455 from Yoshax/gendertweak
Gender tweaks and adjustments
2016-05-05 10:18:25 -04:00
Neerti
bbf2468688 Adds ability for players to ignore other players. (#1539)
Players can now choose to not receive messages in OOC and deadchat from specific players, with the Ignore verb, or in the global preferences tab.
Ignores can be reverted with the Unignore verb, or with the global preferences tab as well.
This has no effect on IC chat. LOOC is also exempted from this.  Admin messages cannot be blocked.
2016-05-05 10:14:34 -04:00
Datraen
efbe346c12 Removes circuit boards from relevant checks for microwaves, cooking. 2016-05-05 01:24:38 -04:00
Yoshax
4d160c261d Revamps cargo supply code to allow for nicer code (#1508)
* Adds lunchboxes to dinnerware vendor and buffs the amount of ingredients the chef starts with

* Revamps cargo supply code to allow for multiple items to be ordered on one line and nukes the remaining multiple lined orders

Corrects a number mistake

Fixes some list formatting

Actually fixes list formatting

* Removes a stray comma
2016-05-04 17:20:22 -04:00
Yoshax
80caae01b6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into roboticsandcells 2016-05-04 18:50:40 +01:00
silveryferret
e518ce53e6 Manifestcheck (#1543)
* Manifest Check

Adds a check for "Be Cultist" before summoning a manifest ghost
2016-05-04 13:36:41 -04:00
Datraen
f2b1b56243 Renegade cap changed, autotraitor added to mixed traitor renegade. (#1529) 2016-05-04 15:27:37 +01:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
Yoshax
023216389e Changes tinted windows in robotics to normal; Removes tweaked medical console; Replaces with normal medical records console; Changes access console access requirement to include robotics. 2016-05-03 23:11:14 +01:00
SinTwo
5ae20ceb8b Buildables v1.2 (#1517)
* Removes text2path, adds constructability to a few things, adds a locker_painter.dm, and several fixes.

* Fixes Maps due to working on ancient versions.

* Path error.

* Adds a missing ..()
2016-05-03 22:18:12 +01:00
Yoshax
f3cf85e9e6 Fixes a typo 2016-05-02 20:14:45 +01:00
Yoshax
af8dcac262 Remaps robotics and mechbay slightly, other adjusts and adjusts cell charger power usage to up charge rate 2016-05-02 19:16:06 +01:00
EmperorJon
f62eacf6e5 Merge pull request #1519 from Yoshax/smokegrenades
Smoke grenade changes and adjustment
2016-05-02 18:04:23 +01:00
Yoshax
6072ad758a Removes a bunch of old, unused code 2016-05-02 14:13:50 +01:00
Yoshax
5824f0a7c1 Comments out smoke reducing laser damage until there's a nice way to do it 2016-05-02 13:44:47 +01:00
Datraen
3baf91b46e Merge pull request #1307 from Neerti/3/30/2016_dumb_gun_balance
Dumb Gun Balance Patch
2016-05-01 17:42:25 -04:00
Yoshax
5bc7eaa212 Removes stupid vars, adjusts smoke code 2016-04-30 20:04:43 +01:00
Yoshax
1e78ff97e1 Adjust smoke color selection 2016-04-30 14:29:46 +01:00
Anewbe
22a9b32a29 Fixed the map thing and a few other issues. 2016-04-29 19:08:04 -05:00
Anewbe
7b1eb6c099 Refactors specialized satchels as children of the regular (leather) satchel 2016-04-29 18:44:28 -05:00
Yoshax
c4929aa43f Adds ability to change color of smoke of smoke grenades with a multitool 2016-04-29 20:30:31 +01:00
Yoshax
b57ea6a752 Adds colored smoke grenades and ability for them to take color 2016-04-29 17:19:08 +01:00
Datraen
3e8c503d05 Merge pull request #1477 from Yoshax/renegades
Adjusts renagade gun list and spawns the gun in a bag if one exists
2016-04-28 19:20:44 -04:00
Datraen
4416d17b0a Merge pull request #1507 from Yoshax/bugfixes
Adjusts HoS' locker capacity & moves CE's office camera
2016-04-28 19:17:29 -04:00
Datraen
f02c557603 Shuffles a line around. 2016-04-28 18:06:34 -04:00
Yoshax
5d6e129ebf Adjusts HoS' locker capacity 2016-04-28 21:37:57 +01:00
Datraen
45f97f2a45 Merge pull request #1491 from Hubblenaut/morgue
Morgue Trays interface with occupant minds
2016-04-27 20:49:15 -04:00
Yoshax
72ece69850 Moves double barreled out of the secondary list and into the main 2016-04-27 23:54:03 +01:00
Mark9013100
b8df470125 Punctuation fixes: Cult edition 2016-04-27 16:08:18 -04:00
Yoshax
4eabbcc8d1 Adjusts the equip proc to be better 2016-04-27 17:32:12 +01:00
Neerti
73c723c8d4 Merge pull request #1469 from Nerezza/DefaultCoolerCell
Upgrades default suit cooler cell
2016-04-25 14:36:48 -04:00
Hubblenaut
c61053d432 Morgue Trays interface with occupant minds 2016-04-25 20:10:43 +02:00
Jon
b779f721ae Moves antag text to antag levels. Changes renegade text from default to make it clear they're minor antagonists meant to resist the major ones. Changes ERT text to make it clear they're not antagonists (not that anyone ever comments on it, but that is what it says)... 2016-04-23 00:06:30 +01:00
Yoshax
d2683a3f0b Removes auto-shotty from renegades list 2016-04-22 19:21:02 +01:00
Yoshax
944bd3f5bb Adjusts renagade gun list and spawns the gun in a bag if one exists 2016-04-22 16:19:47 +01:00
Neerti
7c0973a44b Merge pull request #1471 from Yoshax/ivfix
Adds a check to ensure only living mobs can attach and detach IVs
2016-04-21 21:08:45 -04:00
Neerti
554adc1743 Merge pull request #1467 from Nerezza/ParaDuffels
Adds EMT Duffelbags
2016-04-21 21:08:19 -04:00
Neerti
114a3e38bc Merge pull request #1463 from Yoshax/storagefixes
Normalises medical item storage size + fixes
2016-04-21 21:07:34 -04:00
Neerti
2a946fc23d Merge pull request #1243 from Kelenius/cleanupTwo
Mob inventory cleanup, part 2
2016-04-21 21:07:22 -04:00
Yoshax
81dfe5d9c2 Adds a check to ensure only living mobs can attach and detach IVs 2016-04-22 01:15:07 +01:00
Nerezza
4618c49793 Upgrades default suit cooler cell
Considering suit coolers are dedicated EVA equipment instead of emergency equipment, it's strange that they come equipped with a cell that lasts a handful of minutes in operation instead of a duration more comparable to an oxygen tank's.

This upgrades their default cell so that FBPs can grab, combine, and go just like other crewmembers.
2016-04-21 18:25:44 -05:00
Nerezza
983aa8cf56 Wizard Federation Redacted
What illuminati?
2016-04-21 18:05:09 -05:00