75246052a3
Merge branch 'master' of https://github.com/tgstation/-tg-station into GrabPull
2014-04-15 01:24:51 +04:00
40c349c052
A little tweak
2014-04-15 01:24:36 +04:00
362a428b86
Merge pull request #3411 from GunHog/TatorTry
...
Gives the CE Advanced magboots for traitors to steal, and lets Sci make normal magboots![MAP]
2014-04-14 22:37:58 +02:00
229aaeb1a1
Updates the magboots file to Gia's changes.
2014-04-13 13:37:59 -05:00
df3fb78613
Fixes a critical exploit.
...
While browsing through my server's code looking for possible exploits to fix, i noticed the following :
The autolathe can be used to duplicate any and all objs.
The faulty code accepts any refID from the usr without a safetycheck to see if the requested obj is in the autolathe_recipes list.
This works "only" on objs because it will trigger a runtime error if the object has no material vars.
The default buildcost values for obj are zero, so it always goes through the materials-check, but it would not be sufficient to plug this exploit at this point.
The trivial fix is to have a check to see if the given refID is in the autolathe_recipes list, although a datum-based construction method would probably be more robust.
As basically identical autolathe code appears to be used in Baycode , /tg/, /vg/, Para, and all other builds i could look at, i assumed this exploit has been undetected since Goon.
And indeed, the faulty code is present in Gooncode rev4407 and has been ever since.
2014-04-13 11:55:37 +02:00
4a1ef3e53e
Merge pull request #3398 from Giacom/optimised_recursive_mob_check
...
Small optimisation to recursive_mob_check() ...
2014-04-13 00:26:26 -03:00
ffe7f6d4a4
Merge branch 'master' of https://github.com/tgstation/-tg-station into GrabPull
2014-04-13 00:04:51 +04:00
a250e5f670
More !!FUN!!
...
Im open to discussion as to remove some of the TOO op mutations
2014-04-13 00:04:41 +04:00
1366822ec7
Lets Sci make magboots!
2014-04-12 13:53:06 -05:00
da977a79e2
Adds the advanced magboots.
2014-04-12 13:51:06 -05:00
23d39a296a
Switches magboot target to the CE's boots.
2014-04-12 13:48:51 -05:00
1d25935a47
Merge pull request #3294 from RandomMarine/sprayvars
...
Spray bottle tweaks and additions.
2014-04-11 23:08:55 +01:00
cf2511312c
Small optimisation to recursive_mob_check() by using associative lists and Cut().
2014-04-11 09:10:23 +01:00
6e641397bf
Message fix
2014-04-11 02:31:52 +04:00
d26e1ee5ac
Fastfix of name
2014-04-11 02:28:41 +04:00
cae9fa555d
Merge branch 'master' of https://github.com/tgstation/-tg-station into GrabPull
2014-04-11 01:36:49 +04:00
cb5eaf0b10
Tweaks and giggles
2014-04-11 01:36:38 +04:00
050b1cbf73
Merge pull request #3376 from VistaPOWA/point_blank
...
Adds point blank shooting
2014-04-10 16:03:55 -05:00
69d4f658d2
Emergency fix to make the code compile.
...
I'm so sorry ;_;
2014-04-10 22:03:28 +02:00
d783bccb6e
Merge pull request #3383 from MrPerson/qdel_spells_TAKE_TWO
...
Make reenter-corpse not delete your spells
2014-04-10 21:55:17 +02:00
b18cc7d54e
Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat
...
Conflicts:
code/game/machinery/doors/airlock.dm
code/game/objects/structures/door_assembly.dm
code/game/objects/structures/false_walls.dm
code/game/objects/structures/mineral_doors.dm
code/modules/research/protolathe.dm
icons/obj/doors/door_assembly.dmi
2014-04-11 02:51:07 +10:00
8c2b5bf29a
Merge pull request #3367 from MrPerson/qdel_telecomms
...
Make Telecomms equipment garbage collect
2014-04-10 17:05:02 +02:00
31d851d315
Such vines
...
So mutation
2014-04-10 07:51:20 +04:00
910dae4154
Make reenter-corpse not delete your spells
2014-04-09 13:10:48 -07:00
31cfe0ba80
Merge pull request #3378 from Donkie/jobrefactor
...
Jobcode refactoring TAKE TWO
2014-04-09 13:52:37 -05:00
c74edd9b42
MEIN GESPANNEN
2014-04-09 20:24:58 +02:00
dd493117a7
Fixed merge conflict issues
2014-04-09 19:19:36 +02:00
fde4cfe4fd
Merge pull request #3323 from Ikarrus/signalorigin
...
Emergency Shuttle Signal Tracing
2014-04-09 18:51:18 +02:00
30bb6c8814
Generalised ID naming
2014-04-09 18:49:59 +02:00
03c1d7f673
Removed debugging code
2014-04-09 18:46:12 +02:00
cd161aa6c0
Job refactoring done
2014-04-09 18:46:00 +02:00
2a841c6dff
Further work on job refactoring
2014-04-09 18:43:30 +02:00
67cd5fa847
Start of large job refactoring
2014-04-09 18:43:29 +02:00
6c668c7c7b
Generalised PDA naming
2014-04-09 18:43:29 +02:00
eb77aa6871
Merge pull request #3365 from Firecage/master
...
Standardised and Sensible circuitboard design names
2014-04-09 09:37:02 -07:00
bd4156f18c
Adds missing newline
2014-04-09 15:08:51 +02:00
ef5fed5aa0
mergending
2014-04-09 15:07:06 +02:00
e4e7331399
Adds point-blank shooting
...
Adds point blank shooting, now you can shoot anyone even if they are on
the same tile or one tile from you. On harm intent, you BUTT-STROKE or
PISTOL WHIP (military terms!!) people with the gun, allowing for not
quite harmful floggings.
Makes gun.dm less shit.
2014-04-09 15:02:33 +02:00
35950b90fd
SecMapChangeV3
2014-04-09 19:17:11 +08:00
f44e3ffbf1
Merge pull request #3244 from MrPerson/qdel_tweaks_3-31-14
...
More qdel() changes
2014-04-08 15:37:44 -07:00
eec07e23f7
Merge pull request #3355 from Ikarrus/mineralstorage
...
Mineral Storage Access
2014-04-08 09:53:28 -07:00
81187c4243
Reverted Bartender Changes
2014-04-08 08:40:23 -06:00
6b19ab982a
Merge pull request #3361 from Perakp/tiny_prick_fix
...
Changeling bug fixes
2014-04-08 14:57:08 +02:00
77829dbc9a
Merge pull request #3035 from Miauw62/warnstandardization
...
Standardizes and expands the warning() and error() procs.
2014-04-08 09:51:10 -03:00
c633d2e197
Merge pull request #3327 from Malkevin/gamemodedebug
...
Fixes my gamemode debugger
2014-04-08 14:49:39 +02:00
b97a61c11f
FUCK YOU GIITTTT ;_;
2014-04-08 14:47:05 +02:00
5abb553f4a
Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
...
Conflicts:
code/_onclick/telekinesis.dm
2014-04-08 14:29:58 +02:00
aad822768f
Sensible circuit design names
...
Signed-off-by: Firecage <firecage@hotmail.com >
2014-04-08 14:09:40 +02:00
dd8891ef35
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_tweaks_3-31-14
...
Conflicts:
code/game/machinery/camera/camera.dm
2014-04-08 04:53:05 -07:00
2891713637
Make Telecomms equipment garbage collect
2014-04-08 04:30:09 -07:00
Razharas
Miauw62
GunHog
Walter0o
Aranclanos
fleure
Giacomand
Cheridan
Jordie0608
MrPerson
Daniel
Razharas
VistaPOWA
Steelpoint
Ikarrus
Firecage