Commit Graph

16017 Commits

Author SHA1 Message Date
variableundefined
00a0acb2ec Merge pull request #10340 from Kyep/chaplain_1
Chaplain tweaks
2018-11-29 14:22:03 +08:00
Kyep
a65f8b690b spacing 2018-11-28 19:38:09 -08:00
Kyep
b4acc30b2e removes alignment system 2018-11-28 19:23:26 -08:00
variableundefined
9ed8f24bc1 Merge pull request #10369 from MrKicker/holopadSort
Sorts callable holopads before displaying
2018-11-28 14:04:03 +08:00
MrKicker
49325649b9 sort callable holopad names
sorts the callable holopads before displaying
2018-11-27 23:59:51 -05:00
variableundefined
63490c8378 Merge pull request #10330 from tigercat2000/multilingual
Multilingualism
2018-11-28 10:48:19 +08:00
Kyep
c5a4abeb8b changes alignments to light/neutral/dark, removes atheism 2018-11-27 17:34:10 -08:00
Kyep
4d5d97024b removes unnecessary spawn() 2018-11-26 15:29:44 -08:00
Kyep
032a8e00a5 sanctified nullrod hallelujah on pickup, once 2018-11-26 14:04:12 -08:00
Dovixx
b2a505a641 No more attaching when incapacitated 2018-11-26 16:53:44 +02:00
variableundefined
5a076f3a1c Merge pull request #10345 from TDSSS/medbay-secondary
Medbay Secondary Storage change
2018-11-26 17:51:23 +08:00
variableundefined
0a7db4eca2 Merge pull request #10341 from datlo/deconstructguillotine
Make guillotines deconstructable
2018-11-26 17:50:53 +08:00
Kyep
41062f46ad added hit sound for failed sanctified nullrod pickup 2018-11-25 16:56:38 -08:00
Kyep
a8ce5cdc2a adds sanctified red/gamma ERT nullrods 2018-11-25 16:18:32 -08:00
Kyep
77c244a91e fixes more cases of code snowflake 2018-11-25 15:32:07 -08:00
Kyep
3256ed83e3 updates based on feedback, mostly Tay's 2018-11-24 19:30:39 -08:00
TDSSS
ca9f200629 Area renaming 2018-11-25 04:06:12 +01:00
variableundefined
d283cd1b4b Merge pull request #10317 from datlo/advancedmimery
Adds the advanced mimery kit to mime uplink
2018-11-25 08:51:31 +08:00
datlo
9e7900d2c1 don't copy and pasta, kids
fixed spacing and unnessecary /the
2018-11-25 00:40:09 +00:00
variableundefined
24ace06513 Merge pull request #10324 from granodd/ReagentScannerUpgrade
The Old Mass Spectrometer is Dead, Long Live the Reagent Scanner
2018-11-25 08:38:29 +08:00
datlo
c22f2909c7 Make guillotines deconstructable 2018-11-25 00:26:54 +00:00
Kyep
b50016891e removes all spells but bless, fixes bugs, adds holy torch 2018-11-24 14:07:21 -08:00
variableundefined
cfd0e88c29 Merge pull request #10284 from AzuleUtama/discounts
Port TG's uplink discounts
2018-11-24 21:54:10 +08:00
tigercat2000
e56750481c Multilingualism
This commit adjusts the speech parsing system to allow for an infinite
number of languages to be present in the same message. You can
transition freely between any language you are able to speak simply by
putting it's language key in the middle of the sentence.

Honestly, this was a massive pain in the ass, and there's probably still
broken stuff, even though I've spent around 8 hours testing and refining
this.
2018-11-24 00:22:05 -08:00
Kyep
b139af2bdd v1 2018-11-23 20:08:49 -08:00
Granodd
4b1ee1eeb6 Removing the mass spectrometer and replacing it with the reagent scanner. 2018-11-23 19:48:18 -05:00
variableundefined
328a2d3dcb Merge pull request #10283 from Ty-Omaha/reflector-blob
Adds/ports modified reflective blobs
2018-11-24 08:28:37 +08:00
Ty-Omaha
f92db224c9 removes pulse check 2018-11-23 19:16:32 -05:00
AzuleUtama
ad03363936 stopped random potentially picking a discount after its been bought
Fixed a very unlikely to occur bug, also got rid of old code that served no purpose.
2018-11-23 21:37:28 +00:00
Ty-Omaha
cb8bc0f34d reflector blobs 2018-11-23 11:19:55 -05: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
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
variableundefined
80ddd0e8a3 Merge pull request #10303 from AzuleUtama/syndiecigsMaintloot
Add Syndicate Cigarettes to Maintenance Loot
2018-11-22 19:20:54 +08:00
variableundefined
b2ce6e5829 Merge pull request #10300 from AlAtEX/IPC-repair
Adds a Medkit for IPCs
2018-11-22 11:53:11 +08:00
variableundefined
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
variableundefined
4a01a631f4 Merge pull request #10297 from Kyep/adm_fixes
Adds Hellhound, minor outfit tweaks
2018-11-22 08:24:18 +08:00
AlAtEx
e6740168d9 Added machine first aid kit code 2018-11-21 18:14:40 -05:00
AlAtEx
4025abbbbb Revert, The Sequel 2018-11-21 16:05:41 -05:00
AlAtEx
c2be8936eb Revert 2018-11-21 15:59:39 -05:00
Ty-Omaha
32a259a1e9 spacing 2018-11-21 10:55:23 -05:00
Ty-Omaha
2ce52aa2fe ricochet and stuff 2018-11-21 10:50:45 -05:00
AzuleUtama
9f0c127d9a Add syndi cigs to maint loot
Since an item classed as legal can only be gotten on the uplink right now.
2018-11-21 11:21:24 +00:00
Michael C
bbba753001 Update boxes.dm 2018-11-20 21:04:49 -05:00
Michael C
f1d52f58fe Update support.dm 2018-11-20 21:04:09 -05:00
Michael C
920c1ec71e Update job.dm 2018-11-20 21:03:35 -05:00
AzuleUtama
609d429233 Got things working properly... ish 2018-11-21 00:00:17 +00:00
Fox McCloud
fca03ff254 Merge pull request #10032 from variableundefined/SqueakComponent
Add in squeak component & refactor bikehorn, mouse to use it.
2018-11-20 18:38:42 -05:00
Kyep
39b6725555 hellhound + minor tweaks 2018-11-20 15:19:19 -08:00