Commit Graph

22463 Commits

Author SHA1 Message Date
SouDescolado
4d92cb1506 Update briefcase.dm
Removed Law Stamp from briefcases (Not all briefcases spawn at the law office)
Tried to bribe travis with cookies.
2015-12-30 14:12:59 -02:00
SouDescolado
379cdde284 Update briefcase.dm
gah
2015-12-30 14:05:51 -02:00
SouDescolado
4a31ab7b3e Update briefcase.dm
Fixed travis(?), added law stamp to briefcase
2015-12-30 14:00:55 -02:00
SouDescolado
37d8bf27be Update briefcase.dm 2015-12-30 13:48:21 -02:00
SouDescolado
3841d8b8ea Update briefcase.dm 2015-12-30 13:35:00 -02:00
SouDescolado
43bf151814 Stacks the papers inside a folder inside briefcase
Briefcases now spawn with a pen and a blue folder, filled with papers, instead of spawning filled with papers.
2015-12-30 13:26:24 -02:00
SouDescolado
9a021cff3d Stacks the papers inside a folder inside briefcase
Makes all paper be neatly stacked inside a folder in the briefcase.
2015-12-30 13:11:04 -02:00
tkdrg
5930ee0d66 Merge pull request #13588 from Lo6a4evskiy/quick-equip-refactor
Refactor quick-equip verb
2015-12-29 14:26:48 -03:00
Lo6a4evskiy
6080a8fa96 Fix buckets with liquid not quick equipping 2015-12-29 18:20:42 +04:00
Lo6a4evskiy
ab6fb1ab36 Refactor using slot_equipment_priority 2015-12-29 17:59:56 +04:00
Remie Richards
664a3aec11 Merge pull request #14071 from tkdrg/cuuuuult
More cult tweaks
2015-12-29 07:07:07 +00:00
Remie Richards
ae2ef83fc6 Merge pull request #14062 from tkdrg/jesusFUCK
[s]Fixes secbot construction dupe
2015-12-29 07:06:19 +00:00
Remie Richards
dcea576585 Merge pull request #14063 from tkdrg/you_are_now_breathing_manually
Manual bans will now add notes automatically
2015-12-29 07:05:53 +00:00
Remie Richards
b39dfd5418 Merge pull request #14064 from tkdrg/litlog
Adds a message_admins() when a flamethrower is lit
2015-12-29 07:05:11 +00:00
Remie Richards
d7fe8cd172 Merge pull request #14077 from tkdrg/windoorfix
Fixes unpowered windoors being stuck closed
2015-12-29 07:04:32 +00:00
Remie Richards
7ae7fa0d88 Merge pull request #14113 from tkdrg/DUPES
Adds a "dupe marked datum" option to Game Panel
2015-12-29 07:04:14 +00:00
tkdrg
f42380dfc8 Merge pull request #13945 from Bawhoppen/czechwoodenbuckler
Adds wooden buckler shield
2015-12-28 23:51:53 -03:00
tkdrg
dc0c056fc9 Merge pull request #14109 from Incoming5643/guns_and_guns_and_more_guns
Summon Guns 2016
2015-12-28 22:58:47 -03:00
Incoming
326937efc6 Merge branch 'guns_and_guns_and_more_guns' of https://github.com/Incoming5643/-tg-station into guns_and_guns_and_more_guns
# Conflicts:
#	code/game/gamemodes/wizard/rightandwrong.dm
2015-12-28 20:50:50 -05:00
Incoming
b7ecdf6a2f Adds scatter lasers to the drop list
Changes it so scatter lasers start in scatter mode to drive home the point

CODING STANDARDS
2015-12-28 20:47:32 -05:00
tkdrg
a3533519ea Merge pull request #13995 from KorPhaeron/tokiwotomare
Timestop fixes
2015-12-28 19:44:08 -03:00
tkdrg
2d990ea834 Merge pull request #14076 from RemieRichards/VehicleFramework
Simple Vehicle Framework
2015-12-28 19:41:59 -03:00
Remie Richards
db6f01bf5e Formalises Path Compatibility 2015-12-28 22:20:33 +00:00
tkdrg
42efa497fc Merge pull request #13907 from optimumtact/meatyores
Reduce count of meteors
2015-12-28 19:08:11 -03:00
tkdrg
75df8a35e0 Merge pull request #14102 from KorPhaeron/foam
Unrestricted foam force weapons for admin spawn
2015-12-28 18:47:59 -03:00
tkdrg
28cacc55c7 Merge pull request #14099 from AnturK/crayonstuff
Adds buffered writing mode to crayons/spray cans.
2015-12-28 18:47:47 -03:00
tkdrg
7090e124dd Merge pull request #13802 from KorPhaeron/random_ruin
Random ruins for space/lavaland [ready for review]
2015-12-28 18:40:13 -03:00
tkdrg
50ab7b824b Merge pull request #14094 from KorPhaeron/pda
PDA messages now have a (F) link for ghosts
2015-12-28 18:24:01 -03:00
duncathan salt
b943109a02 Merge pull request #13905 from KorPhaeron/weather
Weather datums [WIP]
2015-12-28 22:06:31 +01:00
duncathan salt
0aca78f381 Merge pull request #14100 from Anonus/blobberno
Blobbernauts can no longer smash walls.
2015-12-28 22:04:11 +01:00
Kyle Spier-Swenson
34daa84e79 FIXES DO_MOB FUCKING UP THE SERVER 2015-12-28 10:44:31 -08:00
Kyle Spier-Swenson
c3d1c92d64 Fix certain progress bars counting down vs counting up.
I never hit save when i did this fix before pr-ing this. =\
2015-12-28 10:39:44 -08:00
tkdrg
eed4e4e5fe Merge pull request #13860 from LanCartwright/plasmaknucklesandwich
Fixes Plasma Fist fighting style
2015-12-28 14:37:46 -03:00
tkdrg
e88bf4e2b5 Merge pull request #14084 from MrStonedOne/GOOOOOF
Upgrades do_after and progress bars.
2015-12-28 14:35:34 -03:00
Kyle Spier-Swenson
695afcc94e removes last_move checks from do_after/do_mob
it ticks at 1ds now, the cases where you could move and come back are rare, and require the server to be running at 21fps or higher and you have perfect lag and timing.
2015-12-28 09:21:45 -08:00
LanCartwright
a4977e3e2d fixes drunk typo 2015-12-28 17:06:27 +00:00
tkdrg
555fc6671a Merge pull request #14093 from KorPhaeron/TK
Fixes throwing anchored objects with TK
2015-12-28 13:37:44 -03:00
KorPhaeron
f312f65aad anti-infinite loop 2015-12-28 09:38:41 -06:00
KorPhaeron
b99ad60d52 Removes area proc properly 2015-12-28 09:31:37 -06:00
KorPhaeron
d4dd3adccb Removes updates to area proc 2015-12-28 09:30:28 -06:00
KorPhaeron
f0def4cb4c Forgot to remove undef 2015-12-28 09:26:41 -06:00
KorPhaeron
9d9bd85350 Removes ruin stuff from MC 2015-12-28 09:26:06 -06:00
KorPhaeron
249dc92ade Remove deepspace define 2015-12-28 09:24:21 -06:00
LanCartwright
b4c9dc60eb Update martial.dm 2015-12-28 13:59:07 +00:00
KorPhaeron
f314b99777 Fixes timestop loops 2015-12-28 05:30:26 -06:00
AnturK
47a7a9656c Makes the write default to current buffer 2015-12-28 11:17:40 +01:00
tkdrg
50a92d5152 Merge pull request #14115 from neersighted/hotfix
Fix NanoUI and \improper for real
2015-12-28 03:43:11 -03:00
Bjorn Neergaard
d542163e66 Fix NanoUI and \improper for real 2015-12-28 00:18:43 -06:00
Tkdrg
bc7c25429d More cult tweaks
Shuttle will no longer launch after the large shell is placed.
Summoning Nar-Sie will no longer red alert.
Fixes an edge case with trying to summon shell after nar-sie is out.

Fixes #14042
Fixes #14043
2015-12-28 01:55:04 -03:00
tkdrg
10867c4aa2 Merge pull request #14069 from Bawhoppen/czechgnades
Makes concussion grenade explosion smaller
2015-12-28 01:49:43 -03:00