Commit Graph
2543 Commits
Author SHA1 Message Date
Ty-Omaha 57b90ef719 custom emote 2018-12-25 03:03:19 -05:00
variableundefinedandGitHub 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
variableundefinedandGitHub 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
variableundefinedandGitHub 678d4fa20e Merge pull request #10469 from datlo/grenadierbelt
Ports the grenadier belt from tg
2018-12-24 09:16:02 +08:00
variableundefinedandGitHub e892535b27 Merge pull request #10364 from Allfd/nofunallowed
Remove fart based mechanics
2018-12-24 09:13:47 +08:00
datloandGitHub 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
variableundefinedandGitHub 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
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
variableundefinedandGitHub 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
variableundefinedandGitHub 9e5deff65e Merge pull request #10409 from AzuleUtama/uplinkSearch
Uplink - Collapsible Categories and Layout Tweaks
2018-12-11 20:45:45 +08:00
variableundefinedandGitHub 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
variableundefinedandGitHub 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
AzuleUtama 00c34f1935 Blocks job specific gear category for nukies, removed last of 'return' function uplink code, minor layout changes to template 2018-12-07 00:09:11 +00:00
Mars 7841d851f6 Item_action customizing icon + custom icons for arm implants 2018-12-01 13:42:38 +01:00
Citinited 6354631937 Fixes lots of items not being taped by duct tape; tape won't be applied to bags if it can be inserted 2018-12-01 00:13:21 +00:00
variableundefinedandGitHub 00a0acb2ec Merge pull request #10340 from Kyep/chaplain_1
Chaplain tweaks
2018-11-29 14:22:03 +08:00
Kyep b4acc30b2e removes alignment system 2018-11-28 19:23:26 -08:00
Citinited 53300b82ea Sticky tape crates have a small chance of spawning a rubber duck 2018-11-29 00:11:53 +00:00
Citinited 88ff4eb49f Some fixes for taping, also bumps up max_amount for tape rolls and adds a tape supply pack 2018-11-28 22:21:59 +00:00
Kyep c5a4abeb8b changes alignments to light/neutral/dark, removes atheism 2018-11-27 17:34:10 -08:00
Alffd 183e47a28e Rework rathens 2018-11-26 22:01:22 -05:00
AzuleUtama 61274f2573 Fix for power beacon buff oversight 2018-11-26 23:09:48 +00:00
Kyep 58ee1ce058 chaplain can no longer tell who is already blessed 2018-11-25 16:33:21 -08:00
Citinited fb15d92d57 Fixes issue with duct tape bypassing walls 2018-11-26 00:19:49 +00:00
variableundefinedandGitHub 56ec930ef1 Merge pull request #10335 from datlo/powerbeaconbuff
Reduce power beacon cost to 10 and make it hijack only
2018-11-26 08:18:26 +08:00
Citinited 05b9955f2b You can stick duct tape to more than just paper now 2018-11-25 23:03:10 +00:00
datlo 2c3541b95f Fix a couple of finger gun issues 2018-11-25 19:04:53 +00:00
Kyep 3256ed83e3 updates based on feedback, mostly Tay's 2018-11-24 19:30:39 -08:00
e7e4a277b1 Apply suggestions from code review
p.them suggestions

Co-Authored-By: Kyep <16434066+Kyep@users.noreply.github.com>
2018-11-25 03:23:18 +00:00
variableundefinedandGitHub d283cd1b4b Merge pull request #10317 from datlo/advancedmimery
Adds the advanced mimery kit to mime uplink
2018-11-25 08:51:31 +08:00
Kyep b50016891e removes all spells but bless, fixes bugs, adds holy torch 2018-11-24 14:07:21 -08:00
datlo 0894cb9aa9 Reduce power beacon cost to 10 and make it hijack only 2018-11-24 17:28:42 +00:00
AzuleUtama f154318946 Added alternate game log should the item have limited stock
Also via request of spartan
2018-11-24 16:41:42 +00:00
datlo aca8b5ca0f changes vow of silence/spell adding checks 2018-11-24 16:08:47 +00:00
AzuleUtama 8747dc9d43 Hotfix for discounts to blacklist all job gear
On spartan's request
2018-11-24 14:20:36 +00:00
Kyep b139af2bdd v1 2018-11-23 20:08:49 -08:00
AzuleUtama 3c1c251fd3 discount gear now can't be picked in surplus crates 2018-11-23 23:01:12 +00:00
AzuleUtama 3bf5c482ce Small changes and merged with master following some recent additions to uplink items
Keeping it updated alongside master.
2018-11-23 12:03:59 +00:00
AzuleUtama c8fbdd4b42 Merge remote-tracking branch 'upstream/master' into discounts 2018-11-23 11:33:08 +00:00
datlo eeb447d424 spelling
oof
2018-11-23 08:06:04 +00:00
datlo b94beb061a divided mime.dm 2018-11-23 07:47:35 +00:00
datlo a80efa4924 Add the advanced mimery kit to mime uplinks
Also adds :
Mime specific spellbooks
TG wizard forcewall (mime is a subtype, will implement for wiz later
probably)
Fake finger gun spellbook in arcade
2018-11-23 07:23:34 +00:00
variableundefinedandGitHub b2ce6e5829 Merge pull request #10300 from AlAtEX/IPC-repair
Adds a Medkit for IPCs
2018-11-22 11:53:11 +08:00
variableundefinedandGitHub 214cf7b12e Merge pull request #10288 from datlo/basicsofCQC
Snake, try to remember some of the basics of CQC.
2018-11-22 08:53:26 +08:00