Commit Graph

27269 Commits

Author SHA1 Message Date
tigercat2000
5958382ea2 Merge pull request #8511 from Kyep/construction_site_v2
Construction site v2
2018-01-11 12:00:59 -08:00
tigercat2000
1059be1026 Merge pull request #8520 from Aurorablade/LightFireisaFluffyPants
Lightfire is a Fluffy IPC
2018-01-11 11:24:16 -08:00
tigercat2000
eda1ea23a3 Merge pull request #8527 from Jountax/master
Adds sugarcane to the MegaSeed Servitor
2018-01-11 10:54:29 -08:00
tigercat2000
8bf2208071 Merge pull request #8529 from Kyep/deathsquid
Adds Deathsquid. Also, Deafsquid.
2018-01-11 10:37:57 -08:00
tigercat2000
91eafa2357 Merge pull request #8525 from Kyep/demotion_console_fix
Fixes demotion consoles not working for Captain+
2018-01-11 10:31:24 -08:00
tigercat2000
0133cdca5e Merge pull request #8530 from Jountax/Footwear
Fancy Footwear Rebalance
2018-01-11 10:21:40 -08:00
tigercat2000
b0376d3ab3 Merge pull request #8539 from Citinited/jaunter-fix
Fixes jaunters
2018-01-11 10:07:47 -08:00
tigercat2000
73ef100bb6 Merge pull request #8534 from uraniummeltdown/fix
Fixes Atmos Machines Not Dropping Parts
2018-01-11 10:06:51 -08:00
Citinited
8678ae6a69 Fixes jaunters working on non-teleport-allowed levels and vice-versa 2018-01-10 15:20:57 +00:00
Jountax
d15b30f25b Update loadout_shoes.dm 2018-01-10 02:58:56 -05:00
Bxil
3a6ae1cbc9 Update Accounts.dm 2018-01-09 21:31:11 +01:00
uraniummeltdown
d831636715 fixes atmos machines not dropping frame and parts
moves drying rack dropping wood out of Destroy()
transfers fingerprints to dropped machine frame, halves obj_integrity of non-disassembled deconstructed pipes and machine frames
2018-01-09 23:18:22 +05:00
Bxil
8041eee5a9 Accounts timefix 2018-01-09 16:39:37 +01:00
Bxil
e9c8a7c5dd Database terminal timefix 2018-01-09 16:37:40 +01:00
Jountax
5540412229 Update loadout_shoes.dm 2018-01-09 02:45:43 -05:00
Kyep
a5a3a14522 GCS 2018-01-08 23:03:55 -08:00
Kyep
ac0894b257 DeathSquid 2018-01-08 22:59:04 -08:00
Jountax
af07fabc33 Update vending.dm 2018-01-08 07:22:19 -05:00
Kyep
5368f8c8e7 Fixes demotion consoles not working for Captain+ 2018-01-07 20:02:38 -08:00
tigercat2000
964234ca77 Merge pull request #8514 from Kyep/mineral_fix
Fixes misapplication of abductor floor properties to all mineral tiles
2018-01-07 17:08:25 -08:00
Kyep
8e73742e51 fixes merge conflict, removes cyberiad.dmm changes 2018-01-07 16:53:00 -08:00
Aurorablade
b43875d497 TRUE 2018-01-06 23:15:13 -05:00
Aurorablade
4c20790208 blue apprently.. 2018-01-06 21:17:39 -05:00
Aurorablade
70963a8a42 he is floffy fluffy 2018-01-06 20:38:13 -05:00
Kyep
d91d9b6029 Fixes misapplication of abductor floor properties to all mineral tiles 2018-01-05 03:23:10 -08:00
Crazy Lemon
6d7f84d92c Merge pull request #8425 from Terilia/RobotFont
AI & Cyborg - Changing the font in the binary channel to something more robotic
2018-01-04 15:53:12 -08:00
Crazy Lemon
3380b47aee Merge pull request #8412 from uraniummeltdown/shell
New Construct Shell Sprite
2018-01-04 15:46:47 -08:00
Crazy Lemon
12fed20743 Merge pull request #8411 from Kyep/wild_west_fix
Wild west tweaks
2018-01-04 15:45:21 -08:00
Crazy Lemon
2da9316b4e Merge pull request #8226 from Anasari/GarroteBehindYouNuffinPersonnel
Nuke Op items discount & rebalance
2018-01-04 14:51:28 -08:00
Alffd
b860fe72c9 Remove items from donor preferences with wrong license. 2018-01-03 21:29:23 -05:00
tigercat2000
c1c4b08807 Merge pull request #8476 from uraniummeltdown/decon
deconstruct() at obj level + other changes
2018-01-02 10:28:17 -08:00
uraniummeltdown
1c9b3ed159 removes useless alter_health() unused proc 2018-01-02 20:49:28 +05:00
tigercat2000
9241a2ed1e Merge pull request #8494 from SkullyRoberts/AppeaseARC
Remove the Red Cross from the last of the medical sprites
2018-01-01 12:24:37 -08:00
Fox McCloud
5503bb0876 Merge pull request #8497 from tigercat2000/splatter_fix
Remove istype(src) in atoms.dm
2017-12-31 23:54:31 -05:00
Kyep
76a1566cdd also fix a semi-related runtime 2017-12-31 19:37:13 -08:00
Kyep
d348de9be3 revamp engine 2017-12-31 18:17:11 -08:00
Alffd
bb6234c02e Marsmond and Shady changes 2017-12-31 13:35:37 -05:00
Alffd
376f93fe69 Status messages are also modified by colour replace lists. 2017-12-31 13:35:37 -05:00
Alffd
7a25cbb6bd Adjust colors for name overlap 2017-12-31 13:35:37 -05:00
Alffd
379b6621d3 There is no u in color 2017-12-31 13:35:37 -05:00
tigercat2000
f67a15ec2e Merge pull request #8465 from Kyep/iaa_boost
IAA Retool
2017-12-31 08:35:28 -08:00
tigercat2000
6bcc18cd8b Merge pull request #8462 from Fox-McCloud/emp-proof
EMP-Proof Organ Framework
2017-12-31 08:22:04 -08:00
tigercat2000
868261b228 Merge pull request #8204 from Vivalas/moar_nerfs
Adds organ cleansing to surgery
2017-12-31 08:19:01 -08:00
tigercat2000
67d9501d91 Merge pull request #8075 from Vivalas/master
Assorted security changes
2017-12-31 08:12:13 -08:00
tigercat2000
627c1c57c6 Remove istype(src) in atoms.dm 2017-12-31 08:05:54 -08:00
tigercat2000
0aa183751e Merge pull request #8493 from Kyep/construction_site
Improves Construction Site
2017-12-31 08:02:22 -08:00
tigercat2000
591f718995 Merge pull request #7848 from KasparoVy/splat
Splatter Lands 1 Tile Away in Target Dir & Xeno-blood Splatter Colour Fix
2017-12-31 08:00:14 -08:00
tigercat2000
f17445b7ff Merge pull request #8486 from Tayyyyyyy/pinpointer_fix
Fix crew pinpointer losing signal when target enters something
2017-12-31 06:48:16 -08:00
tigercat2000
05cf07289d Merge pull request #8481 from FreeStylaLT/pill_sprite
Adds a toxic pill sprite, makes the toxin and cyanide pills use it
2017-12-31 06:43:30 -08:00
tigercat2000
be9e258fd9 Merge pull request #8468 from Aurorablade/SaltInTheEyes
Decouples Darksight from Colorblind
2017-12-31 06:33:49 -08:00