Mark9013100
037de7086d
Gives the mercs a nuke
2016-03-14 02:55:52 -04:00
Neerti
a61708e369
Fixes mercenaries not showing up at round-end.
...
Also changes 'borg' to 'synthetic' at round-end text.
2016-03-14 02:40:33 -04:00
Datraen
1b40fb3bfe
Traitor Borg lockdown, blowing-up fixed; can now self-hack.
2016-03-12 17:03:28 -05:00
EmperorJon
2aa4e7727c
Merge pull request #1167 from PolarisSS13/3/11/2016_leg_guard_fix
...
Fixes oversight in leg-guard slowdown.
2016-03-12 19:32:39 +00:00
EmperorJon
a730a61478
Merge pull request #1172 from redstryker/Turbans+Kippot
...
Adds Turbans and Kippot and a Hoodie (V2)
2016-03-12 19:31:15 +00:00
EmperorJon
27842e182e
Merge pull request #1166 from Yoshax/splitundie
...
Splits underwear into top underwear and bottom underwear
2016-03-12 19:30:38 +00:00
redstryker
5f7443c063
Adds Turbans and Kippot
2016-03-12 12:34:41 -05:00
Yoshax
44b8ac218c
Adjusts underwear names
2016-03-12 15:57:21 +00:00
Kelenius
89ff4f5fc3
Adds ..() to /obj/structure/New()
2016-03-12 14:13:13 +03:00
Kelenius
359889a15c
Axes old wire, fixes costs in lathe
2016-03-12 11:38:52 +03:00
Yoshax
3b5a027025
Merge remote-tracking branch 'upstream/master' into splitundie
2016-03-12 02:27:54 +00:00
Yoshax
d64bfb3235
Actually fixes the underwear wardrobe
2016-03-12 02:22:34 +00:00
Neerti
e43993b11b
Fixes oversight in leg-guard slowdown.
...
The slowdown was effectively 2 instead of 1 as intended, totaling 3 slowdown for the full set, which is more than the voidsuit slowdown, iirc.
2016-03-11 21:13:59 -05:00
Yoshax
ea32fb2bd0
Fixes errors
2016-03-12 01:53:02 +00:00
EmperorJon
39a2008432
Merge pull request #1142 from Hubblenaut/cash
...
Retail Scanners, Price List Update and Interface Improvements
2016-03-11 23:37:43 +00:00
EmperorJon
40df50e5a2
Merge pull request #1131 from Hubblenaut/barrecipes
...
Fixes two bar recipes
2016-03-11 21:03:15 +00:00
EmperorJon
7734092d85
Merge pull request #1160 from Mark9013100/3/11/2016nomoreslides
...
Removes the need for slides in forensics
2016-03-11 21:00:48 +00:00
EmperorJon
78c53866c2
Merge pull request #1150 from Kelenius/noSplash
...
Removes splash code
2016-03-11 20:47:40 +00:00
Datraen
42bdf7dffc
Merge pull request #1066 from Yoshax/moarundies
...
Adds even more underwear
2016-03-11 14:41:12 -05:00
Yoshax
b2916bbb56
Splits underwear into top and bottom
2016-03-11 19:26:50 +00:00
Kelenius
03a8b46e97
Fixes a roundstart runtime
2016-03-11 12:16:24 +03:00
Kelenius
1cd71da6ed
Fixes one stay missed line
2016-03-11 12:02:01 +03:00
Kelenius
3fdda5e8c5
Fixes issues travis found
2016-03-11 11:59:51 +03:00
Mark9013100
905bda9b2d
Removes the need for slides in forensics
2016-03-11 03:53:12 -05:00
Kelenius
98487242f6
Updates macro count, makes it a var
...
Previous commit added GinjaNinja32's script for checking for <span
class='thing>, this one fixes them
Removes .int check, it's in .gitignore, silly me
2016-03-11 11:31:53 +03:00
Datraen
9b9a23860e
Merge pull request #1149 from Kelenius/AIPDAFix
...
Fixes #1145
2016-03-10 15:25:32 -05:00
Datraen
addbfe11d5
Merge pull request #1153 from Hubblenaut/windowverbs
...
Window Verb Fix
2016-03-10 15:23:12 -05:00
Hubblenaut
c7c5e22717
verb shows on playermade windows
2016-03-10 17:06:09 +01:00
Kelenius
974a2a8216
Removes splash code
...
Unused
2016-03-10 10:55:35 +03:00
Kelenius
069a2e52a9
Fixes #1145
...
Restores 'AI IM' verb tab
2016-03-10 10:30:07 +03:00
Neerti
d412c0a070
Merge pull request #1134 from Kelenius/moreDrills
...
Constructible drills
2016-03-09 20:52:58 -05:00
Hubblenaut
0331ca9242
Extensive Interface Improvement
2016-03-10 01:12:49 +01:00
Hubblenaut
2c815af526
Adjusts price cumulation and logs
2016-03-09 19:06:58 +01:00
Hubblenaut
6ea7295e87
Updates price list
2016-03-09 17:40:11 +01:00
Hubblenaut
51a6241fdd
Merge remote-tracking branch 'upstream/master' into laundry
2016-03-09 15:56:16 +01:00
Mark9013100
994388e138
Fixes floor decal layering
2016-03-09 01:45:47 -05:00
Mark9013100
4963d5a858
New combat helmet sprite
2016-03-08 21:37:04 -05:00
Neerti
7b9f011d10
Merge pull request #1135 from Mark9013100/3/8/2016clothinglockeredits
...
Adds departmental bags to wardrobes
2016-03-08 21:10:37 -05:00
Datraen
be4564d30e
Merge pull request #1128 from Hubblenaut/cash
...
Retail Scanner, Fixes and QOL
2016-03-08 16:40:02 -05:00
Mark9013100
bba0d7e786
Adds departmental bags to wardrobes
2016-03-08 16:37:30 -05:00
Datraen
c2b9452e08
Merge pull request #1130 from Hubblenaut/windowverbs
...
Window Rotation Verbs QOL
2016-03-08 16:35:53 -05:00
Datraen
bddc51e657
Merge pull request #1125 from Neerti/2/28/2016_armor
...
A Load of Armor Changes
2016-03-08 16:32:42 -05:00
Kelenius
63e8fbab46
Constructible drills
...
Mining head circuit available in R&D
Mining brace circuit added
Mining braces can be built and disassembled
2016-03-08 20:46:31 +03:00
Kelenius
0b71767b0f
Finalizes bot updates
2016-03-08 12:55:42 +03:00
Kelenius
e8df17ccad
WIP - cleans up bots
...
Fixes farmbot getting stuck
Floorbots fix asteroid
2016-03-08 11:13:34 +03:00
Hubblenaut
f122902b84
Adds laundry basket
...
Conflicts:
icons/mob/items/lefthand.dmi
icons/mob/items/righthand.dmi
2016-03-07 20:28:41 +01:00
Hubblenaut
64501e9937
Fixes two bar recipes
2016-03-07 20:18:14 +01:00
Hubblenaut
0a85f0c0fa
Retail Scanner QOL
...
Adjusts Size to fit in pocket
Fits in belt slot
Adds technology level for deconstructor (MT 1)
Ability to swipe when shown by show_held_item
2016-03-07 19:50:49 +01:00
Hubblenaut
49d7f0ee3b
Window verbs update, wrench noise on dismantling
2016-03-07 19:12:59 +01:00
Kelenius
9aac404c73
Cleans up and updates votes
...
Absolute pathing, overall cleanup.
Removed two useless vars, simplified process().
Defines instead of strings.
Added "unvote" option that removes your vote.
Vote window now sized according to amount of options.
Added vote controller to debug controller list.
2016-03-07 20:41:39 +03:00
