Darkmight9
895c571eae
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2019-01-08 13:52:41 -05:00
variableundefined
2be520c08b
Merge pull request #10606 from AzuleUtama/uplinkAmmoOrganize
...
Renames and Reorganises ammunition for the Uplink
2019-01-08 15:48:21 +08:00
variableundefined
c650d4bef8
Merge pull request #10604 from Spartan6/cheap_bone_juice
...
Reduces the cost of the Prototype Bone Repair Kit to 4
2019-01-08 15:46:32 +08:00
Kyep
bf9d0b088f
merge conflict fix, reset map
2019-01-07 16:37:07 -08:00
Darkmight9
e653c8dc63
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2019-01-06 19:06:04 -05:00
Darkmight9
8f5f3d44c6
The High Powered Camera a flash disgusied as a camera
2019-01-06 19:05:24 -05:00
datlo
d66b8d9f20
functional
2019-01-06 21:51:22 +00:00
AzuleUtama
b00d85edf9
Renames and reorders ammunition in uplink
2019-01-06 21:32:23 +00:00
Spartan6
b330ca60be
Reduces the cost of Nanocalcium to 4
2019-01-06 16:25:41 +00:00
variableundefined
18881b2592
Merge pull request #10595 from AzuleUtama/caneDartChange
...
Mime's Cane Shotgun ammo reworked and buffed
2019-01-06 16:19:15 +08:00
variableundefined
b3d27c7202
Merge pull request #10584 from datlo/removeuplinkmanagement
...
Replaces uplink management by automated sharing + various misc outfit changes
2019-01-06 16:14:59 +08:00
variableundefined
33c62b9485
Merge pull request #10549 from TDSSS/ssu-changes
...
ID lock for Suit Storage Units + SSU hacking
2019-01-06 15:57:49 +08:00
AzuleUtama
11228ba269
Spelling
2019-01-05 02:29:28 +00:00
AzuleUtama
fb052938c8
Cane shotgun darts more effective + other changes
2019-01-05 01:41:39 +00:00
variableundefined
ebe239c09b
Merge pull request #10501 from datlo/wizforcewall
...
Refactor and buff wizard force wall, add greater force wall
2019-01-04 20:02:54 +08:00
Kyep
0567eab562
Merge branch 'sol_trader_update' of https://github.com/Kyep/Paradise into sol_trader_update
2019-01-03 14:40:07 -08:00
Kyep
d488195799
fix merge conflict, wipe map changes
2019-01-03 14:39:41 -08:00
datlo
61c0f71cce
Replaces uplink management by automated sharing
...
Various admin outfits changes
Add internal box to honk brand infiltration kit
Add fifty TC stack buyable by nukies
Add subtypes of uplinks : Traitor, Nuclear, SIT, SST, Admin, only
checked by auto sharing for now
2019-01-03 16:29:31 +00:00
datlo
275be84ea5
removed capitalised "you"
2018-12-30 19:38:54 +00:00
datlo
52619b291d
typo
2018-12-30 18:10:10 +00:00
datlo
2894798bf0
add magical var to clothing, remove istype checks on spellcast
2018-12-30 17:36:27 +00:00
joep van der velden
1b5322c32e
Refactor a few small things to make my research level parser work and make the code less odd
2018-12-30 15:18:00 +01:00
TDSSS
bf953613e6
Now works!
2018-12-29 20:50:56 +01:00
TDSSS
bfafb515e2
Initial setup.
2018-12-29 15:16:39 +01:00
joep van der velden
646d1ba05a
Now doesn't revoke if it's granted
2018-12-28 16:37:03 +01:00
variableundefined
ce403fa368
Merge pull request #10502 from datlo/wizmagboots
...
Add boots of gripping to the wizard hardsuit
2018-12-28 20:49:15 +08:00
AzuleUtama
2725d57097
Adds 'Grenades and Explosives' Category
2018-12-27 11:54:58 +00:00
Ty-Omaha
57b90ef719
custom emote
2018-12-25 03:03:19 -05:00
datlo
ab2c505848
Add boots of gripping
...
also fix an oversight with plasmeme wizard suit check
2018-12-25 07:36:00 +00:00
datlo
38e6e20941
Refactor and buff wizard force wall, add greater force wall to spell book
2018-12-25 04:49:24 +00:00
variableundefined
9ebd0d255e
Merge pull request #10473 from Aurorablade/HONK
...
Ports Clown Goblins, Adds Honk Missle, Fixes Space Carp Event, Adds Honomoly Event
2018-12-24 09:20:24 +08:00
variableundefined
24ebcda6c4
Merge pull request #10474 from datlo/syndicateremap2
...
Adds Syndi Officer admin job and remaps SST/SIT starting areas 2
2018-12-24 09:17:15 +08:00
variableundefined
678d4fa20e
Merge pull request #10469 from datlo/grenadierbelt
...
Ports the grenadier belt from tg
2018-12-24 09:16:02 +08:00
variableundefined
e892535b27
Merge pull request #10364 from Allfd/nofunallowed
...
Remove fart based mechanics
2018-12-24 09:13:47 +08:00
Kyep
46acb9338b
sunglasses, seeds, KA, IMS, fleshy
2018-12-22 14:16:25 +00:00
datlo
999673fa4d
Raised TC cost to 30
2018-12-19 23:44:12 +00:00
datlo
b0f60602a8
MERGE SHIT REEEEE IMMAH PUNCH A WALL
2018-12-18 11:47:29 +00:00
variableundefined
4bba6eb649
Merge pull request #10452 from Citinited/jingle-my-bells-ho-ho-ho
...
Adds the snow machine
2018-12-18 16:33:01 +08:00
Aurorablade
daf04fa8de
honkening
2018-12-17 22:41:14 -05:00
datlo
3f2804c8bf
adds the grenadier belt and permafrost'd tiles
2018-12-17 11:53:28 +00:00
Aurorablade
86d2a1634c
Casing correction 1
2018-12-17 00:07:37 -05:00
Citinited
0083fba070
More changes
...
Snow machine is cargo-orderable during christmas, code changes, icon
tweaks, snowballs now do stamina damage instead of actual damage
2018-12-14 00:43:34 +00:00
variableundefined
4de3d741a5
Merge pull request #10449 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/let-there-be-light
...
fixes lightning
2018-12-13 09:37:58 +08:00
Joe Schmoe
3a7e06960a
fixes lightning
2018-12-12 22:40:45 +01:00
Kyep
702f4db165
outfit, vehicles, paperfix, viruses
2018-12-12 00:31:56 -08:00
variableundefined
9e5deff65e
Merge pull request #10409 from AzuleUtama/uplinkSearch
...
Uplink - Collapsible Categories and Layout Tweaks
2018-12-11 20:45:45 +08:00
variableundefined
2f73a6ecb1
Merge pull request #10390 from MarsM0nd/Radial_Implants
...
Radial menu for implants and item_action icon.
2018-12-11 20:37:45 +08:00
variableundefined
9e59827416
Merge pull request #10351 from Citinited/duct-tape-stick-tweak
...
You can stick duct tape to more than just paper now
2018-12-11 20:18:05 +08:00
datlo
34db3b373e
add teleporter, various misc changes
2018-12-07 16:29:48 +00:00
datlo
19e5271249
Added syndicate officer as a job proper
2018-12-07 11:07:49 +00:00
