Commit Graph

11703 Commits

Author SHA1 Message Date
Yoshax
fa8bb179bf Fixes #1586 2016-05-11 17:17:43 +01:00
Neerti
cb08c07cf2 Merge pull request #1602 from redstryker/master
Adds Glowsticks
2016-05-11 02:00:51 -04:00
Neerti
861c9d7fdc Merge pull request #1560 from Yoshax/emagupgrade
Adds the ability to feed telecrystals to emags for more uses
2016-05-11 01:55:12 -04:00
Neerti
84d389a0c7 Merge pull request #1479 from Yoshax/limbfixes
Wound Changes + Fixes + Medical Changes
2016-05-11 01:53:58 -04:00
Neerti
b65ed00b5f Merge pull request #1415 from Hubblenaut/reinf
Reinforced Walls
2016-05-11 01:52:46 -04:00
Neerti
3dd6afe8af Merge pull request #1604 from silveryferret/no_roundstart_report
Removes the "Subversive Elements" Cent. Com. report at roundstart
2016-05-11 01:41:20 -04:00
EmperorJon
d869a52c4e Merge pull request #1599 from Yoshax/mercitemfixes
Removes antag limitations on uplink items to make them actually buyable
2016-05-09 15:52:39 +01:00
silveryferret
a9c65176dd Removes the "Subversive Elements" Cent. Com. report
As title.
2016-05-09 09:45:53 -05:00
Datraen
c192d9551f Merge pull request #1568 from Yoshax/doublechance
Adds the ability for vending machines to vend 2 items with a 1% chance
2016-05-09 08:39:03 -04:00
redstryker
8b5ed3d7ff Adds Glowsticks 2016-05-08 18:22:15 -04:00
Yoshax
79b1bf5260 Removes antag limitations on uplink items to make them actually buyable 2016-05-08 22:03:17 +01:00
Yoshax
f9708a2e0e Swaps secret player count for ninja/wizard and ninja&wizard 2016-05-08 16:05:07 +01:00
Yoshax
30bcf94067 Removes for loop and adjusts code 2016-05-08 12:41:38 +01:00
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
92e9b6c25a Adds the ability for vending machines to vend 2 items with a 1% chance 2016-05-06 19:10:00 +01: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
Yoshax
0abb642a60 Adds the ability to feed telecrystals to emags for more uses 2016-05-05 19:59:36 +01: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