f50adb9554
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade
...
Conflicts:
code/_helpers/time.dm
code/modules/economy/ATM.dm
2016-08-09 15:46:24 -04:00
85c3e22873
Polaris sync
2016-08-06 20:34:44 -07:00
89956eaaae
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into dufflebags
...
# Conflicts:
# code/datums/uplink/tools.dm
2016-08-03 19:30:02 +01:00
6ac20b0053
Further uplink item changes. Attempts to reduce the price of some of the more potentially interesting items in an attempt to see them used more often.
2016-07-31 15:23:13 +01:00
dc7e196c82
Corrects surplus crate pricing to scale rewards the more you spend. Proper description can be found in the commit description.
...
120 TC - 240 Worth - 2x Worth
240 TC - 540 Worth - 2.25x Worth
480 TC - 1200 Worth - 2.5x Worth
720 TC - 1980 Worth - 2.75x Worth
2016-07-31 15:19:31 +01:00
62709429ed
Adds "syndicate" dufflebags to the uplink
2016-07-31 14:53:23 +01:00
fe46fac5cc
final new NanoUI fixes and tgui port
2016-07-27 23:01:26 -04:00
afaa35a5e6
Merge pull request #2215 from Yoshax/ammoprices
...
Adjusts the uplink ammo costs
2016-07-27 19:23:07 -05:00
e864ada371
Adjusts the uplink ammo costs
2016-07-27 21:42:36 +01:00
29ad42fea7
Does some stuff
2016-07-27 05:11:12 +01:00
c022725717
Blacklists teleporter board in uplinks for random item
2016-07-26 20:22:05 +01:00
6711cca0dd
Adds a few items to the uplink
2016-07-26 02:44:14 +01:00
7fbb123a4d
Improves/fixes surplus crate item selection
2016-07-25 23:13:12 +01:00
f19c922984
Improves surplus crates
2016-07-25 21:45:54 +01:00
e43487726b
Merge pull request #2199 from Yoshax/fixforitem
...
Corrects an uplink item path
2016-07-25 17:51:19 +01:00
75630d8e92
Corrects a path
2016-07-25 14:56:19 +01:00
eeb5e66c75
Adds orderable tank transfer valves (not actual bombs) to the cargo Phoron crate
2016-07-25 14:53:55 +01:00
9f2ffa9c03
Corrects an uplink item path
2016-07-25 14:39:43 +01:00
cdb09d2946
Merge pull request #2188 from Yoshax/autolathe
...
Rehauls some autolathe code
2016-07-25 10:42:30 +01:00
6945aff868
Merge pull request #2187 from Anewbe/sec_coat_pockets
...
Adds pockets to the HoS and Warden coats
2016-07-25 01:41:45 +01:00
89e98a39fb
Merge pull request #2181 from Yoshax/uplinkcosttweaks
...
Uplink cost tweaks
2016-07-24 17:13:03 -05:00
7e453226dc
Rehauls some autolathe code
2016-07-24 22:02:58 +01:00
56f9e63c64
Adds pockets to the HoS and Warden coats
2016-07-24 15:55:54 -05:00
2f75d4757a
Adds a missing path
2016-07-23 22:48:41 +01:00
ba106d48f9
Adjusts some gun costs
2016-07-23 21:38:30 +01:00
1fc10eaddb
Adjusts surplus crates
2016-07-23 21:15:44 +01:00
305255d2ee
Adjusts uplink item costs
2016-07-23 21:00:53 +01:00
93b7e661c4
Ensures contraband for supply computers can be properly acquired via hacking
2016-07-23 20:24:04 +01:00
fcf34eb54b
Puts a couple of crates into the right file
2016-07-23 20:08:24 +01:00
b5d85c7d71
Converts the empty box supply crate into a shipping supplies crate
2016-07-23 20:05:59 +01:00
a94cad7a59
Merge pull request #2168 from Yoshax/telecrystals
...
Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting
2016-07-22 19:34:08 +01:00
68f83c3c9e
Merge pull request #2163 from Neerti/7/22/2016_ghost_texting
...
Communicator Texting for Ghosts
2016-07-22 19:33:46 +01:00
ae497b0dd8
Communicator Texting for Ghosts
...
Ghosts can now text communicators in round, and can be texted by those back.
This is obviously logged, just in-case funny business occurs.
Adds verbs to display a log of messages that a ghost has sent and received, as well as a verb to send a message to a communicator of their choice.
2016-07-22 12:51:00 -04:00
21f856ed47
Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting
2016-07-22 17:35:20 +01:00
a84afa6e99
Fixes a typo preventing field gens from being bought.
2016-07-21 17:03:15 -04:00
8e7b2e8fe0
Removes the HoS trench from the security uniform crate
2016-07-19 21:45:44 -04:00
1f4ca8dbd0
Removes Assault Carbine from uplink
2016-07-10 04:14:42 -05:00
04e664ca36
Makes cargo datums and shuttle use fifty stacks for material, removes snowflake amount code and var
2016-07-10 03:49:16 +01:00
484fb96202
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
...
# Conflicts:
# .travis.yml
# code/game/machinery/adv_med.dm
# code/modules/mob/mob.dm
2016-07-03 16:21:21 -04:00
ccda51ab68
Adds fluff antag factions, antag visibility options for uplinks.
...
No mechanical changes come of this change, only the ability to have an antagonist faction, as well as having specified visbility for the affiliation itself.
Also adds Skrell home system to the home system list.
2016-06-29 11:25:52 -04:00
7baa3face9
Adjusts and attempts to normalize cargo costs
2016-06-27 19:32:46 +01:00
0eab5e4b80
Adds missing cargo categories
2016-06-20 18:47:24 +01:00
6cb89d4d77
Makes costumes category not borked
2016-06-16 18:50:00 +01:00
3809e30a07
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
...
# Conflicts:
# code/datums/supplypacks/science.dm
2016-06-14 21:09:38 -04:00
cb65295059
Fixes issues with update:
...
Replaces glass boxes on map with new path
Removes duplicate code accepted into Polaris
Moves supplypacks_vr to science_vr
2016-06-14 15:01:37 -04:00
9e79e35964
Makes science group not security
2016-06-13 22:55:30 +01:00
878cf928f8
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
...
# Conflicts:
# .travis.yml
# vorestation.dme
2016-06-13 13:12:40 -04:00
0cbade2d98
Adjusts cargo categories
2016-06-11 20:18:53 +01:00
6984008bca
Splits supplypacks.dm into categorized files, adds subtyping.
2016-06-11 12:13:40 -04:00
299059a5be
Merge pull request #1883 from Yoshax/drinks
...
Ports GinjaNinja32's drinks rewrite from Bay
2016-06-10 23:08:41 -04:00
SinTwo