cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 09:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,557 Commits 2 Branches 1 Tag
978384871706cb471192fdd982b51a8da2cad0c0
Commit Graph

11775 Commits

Author SHA1 Message Date
Datraen
19c89532d2 Merge pull request #1627 from Yoshax/lights 
Lights changes and additions
 2016-05-12 21:58:52 -04:00
Yoshax
939073a0d2 Adds click cooldown to display case 2016-05-13 01:34:19 +01:00
Yoshax
75b1f53141 Comments out ignore and unignoring in character setup, properly removes ability to ignore yourself 2016-05-13 01:16:44 +01:00
Yoshax
e5b863de99 Changelings will now store and use the flavor text of their victims 2016-05-12 20:08:43 +01:00
Yoshax
7fe2150d3f Removes a stray character 2016-05-12 16:36:09 +01:00
HarpyEagle
d3aacce795 Animation and cooldown only come into effect if the flash is actually used 2016-05-12 16:31:07 +01:00
HarpyEagle
7d64004c47 Improves lightswitch lighting 
Now only the light part layers over darkness, and the light provided
is appropriately dim.
 2016-05-12 16:26:56 +01:00
Datraen
9e116ea887 Merge pull request #1625 from Yoshax/vendingmachines 
Vending machine changes and fixes
 2016-05-12 11:23:25 -04:00
HarpyEagle
8079b34a27 Updates flashbangs and flash/flare rounds to take advantage of new lighting. 
Main improvement is somewhat brighter flashes, coloured flares.
 2016-05-12 16:21:39 +01:00
Yoshax
e2c66a3bf2 Weapon sharpness and edge adjustments 2016-05-12 16:13:41 +01:00
HarpyEagle
8f659e2263 Adds a sleep(3) between the vending of two items for effect. 2016-05-12 15:57:23 +01:00
GinjaNinja32
5490c15274 fix vending machine message 2016-05-12 15:54:37 +01:00
PsiOmegaDelta
d8e719b435 Vending machines now clear the coin var on qdel. 
Fixes #12725.
 2016-05-12 15:54:09 +01:00
PsiOmegaDelta
825add164c Fixes vending machines not throwing their items. 
get_product() did not properly return the requested product.
 2016-05-12 15:53:28 +01:00
PsiOmegaDelta
75629504fd Vending machines now store actual object instances. 
These instances are not initialized until someone first adds or removes a product.
The last added item is the first item to be removed.
This prevents cases were you could insert half-eaten chocolate and get back a full bar, for example.
 2016-05-12 15:52:46 +01:00
Yoshax
6b6fb4a6ca Makes blue carpet and AI floor removable 2016-05-12 14:54:40 +01:00
Neerti
4656db4aa9 Adds PDA Multicaster 
Adds a new machine to telecomms, which contains special PDAs corresponding to each department on the station.  Sending a PDA message to one of these PDAs will duplicate it to everyone in the department the PDA is assigned to.  It determines what department someone is in by cartridge type.
Adds cartridges for several jobs that were missing them, for the purposes of being recognized as being in a department.  The cartridges otherwise do nothing.
New circuitboard to build the new pda multicaster.  It can also be deconstructed with the standard machinery deconstruction steps of screwdriver > crowbar.
 2016-05-12 02:50:35 -04:00
Datraen
761ea91a70 Changes the colors of the occupation setup tab. 2016-05-11 21:14:33 -04:00
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
Kelenius
1848682784 Satisfies Travis 2016-05-08 17:05:27 +03:00
Yoshax
30bcf94067 Removes for loop and adjusts code 2016-05-08 12:41:38 +01:00
SinTwo
64df53f568 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes 
Conflicts:
	icons/mob/uniform.dmi
 2016-05-06 21:03:18 -04: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
SinTwo
8f5dd213ed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes 
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
 2016-05-06 18:31:07 -04:00
redstryker
ff361c2023 Changes all references to 'Mars University' to 'Mojave University' 2016-05-06 18:23:40 -04:00
SinTwo
5e4ca22080 Adds skirts by JakkSergal, cleans up skirts, simplify skirts on loadout. 2016-05-06 18:17:19 -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