Commit Graph

1101 Commits

Author SHA1 Message Date
Jordie0608
6530150120 Changed mining equipment locker to mining equipment vendor 2014-05-06 20:01:01 +10:00
Miauw62
5e6d59d95f Merge pull request #3605 from phil235/DualsaberSoundFix
Fixes the lack of hitsounds for the dualsaber.
2014-05-03 16:30:09 +02:00
Alex
09f112c9cb Merge pull request #3572 from Aranclanos/evidencebags
Heil myself
2014-05-02 17:46:04 +01:00
Alex
64073f0a8d Merge pull request #3489 from Aranclanos/ChemGrenades
Chem grenades asay logs improvements
2014-05-02 17:45:11 +01:00
phil235
19734b93cc Fixes the lack of hitsounds for the dualsaber. 2014-04-30 23:37:31 +02:00
Aranclanos
129401c403 evidence bags will now use attackby() to add items to themselves
removed the preattack() proc
2014-04-29 08:38:51 -03:00
Cheridan
892cf5b191 Merge pull request #3505 from MrPerson/who_cleans_those_who_clean_us
Runtime fix for the mop
2014-04-24 20:48:52 -05:00
MrPerson
d56e0c6d04 var rename. Gia's right, this was kinda confusing 2014-04-23 15:11:59 -07:00
fleure
47a23e1465 Merge pull request #3456 from phil235/TrayPinMsgFix
Fixing rolling pin/tray attack stuff
2014-04-23 14:52:58 +01:00
MrPerson
2841124d29 Runtime fix for the mop
The following runtime has occured 40 time(s).
runtime error: Cannot execute null.clean blood().
proc name: clean (/obj/item/weapon/mop/proc/clean)
  source file: mop.dm,22
  usr: Xavier Paynter (/mob/living/carbon/human)
  src: the mop (/obj/item/weapon/mop)

Cause: Someone would mop the same vomit/whatever more than once. The first clean would qdel() the vomit, which resulted in the vomit's loc being null. The subsequent moppings would continue and eventually try to call vomit.loc.clean_blood().
2014-04-22 12:52:33 -07:00
Cheridan
b441e34d14 Merge pull request #3390 from Ikarrus/deptmanagement
Heads may use ID Modification Consoles to manage their department
2014-04-21 22:51:57 -05:00
Aranclanos
169a61b026 Makes fingerprintslast use ckey instead of key
Cleans a bit the prime() code, large grenades won't be a huge copypaste anymore
Asay logs will now show up when the grenade is activated instead of used. Only when The grenade is activated by an assembly.
New proc, get_mob_by_ckey(). Give it a ckey and it will return a mob.
2014-04-21 10:57:56 -03:00
Giacomand
d1b0a76eae Changed the default wiki to tgstation13.org/wiki.
Changed the wiki url format to work with the manuals, you can change the config if there are extra parameters, like title.
Fixed the telescience manual not linking to the telescience guide.
2014-04-20 19:20:33 +01:00
phil235
57bba34352 missed a parenthesis 2014-04-19 21:12:10 +02:00
phil235
7314993d76 Fixing rolling pin/tray attack stuff
* simplify the attack code.
* fix messages and lack of sound when attacking with the rolling pin.
* rolling pin and tray will now use their attack verbs hopefully.
2014-04-19 20:53:45 +02:00
Menshin
a2a154aca9 Fixes for (#3441). 2014-04-19 14:02:37 +02:00
Ergovisavi
f302adc8ab Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-04-16 16:58:28 -07:00
Giacomand
3a6672b639 Fixes manuals being unreadable. 2014-04-15 18:37:48 +01:00
Jordie0608
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
ikarrus
7213d8575a Heads may use ID Modification Consoles to manage their department
-Heads may modify ID access for their department using ID computers
-Heads may only modify access that they get by default
-Heads may demote IDs if they are able to stip away all access from their card
-Heads may not modify a card's name or title, except when Demoting an ID
2014-04-09 23:58:15 -06:00
Cheridan
31cfe0ba80 Merge pull request #3378 from Donkie/jobrefactor
Jobcode refactoring TAKE TWO
2014-04-09 13:52:37 -05:00
Daniel
30bb6c8814 Generalised ID naming 2014-04-09 18:49:59 +02:00
Razharas
f44e3ffbf1 Merge pull request #3244 from MrPerson/qdel_tweaks_3-31-14
More qdel() changes
2014-04-08 15:37:44 -07:00
Miauw
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
MrPerson
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
Razharas
03b34893d5 Merge pull request #3343 from Giacom/small_fixes
Fixes being able to change your chameleon jumpsuit's colour while dead.
2014-04-07 18:48:05 -07:00
fleure
9db94d7c98 Merge pull request #3314 from Steelpoint/WaterTank
Increase's jani water tank's starting space cleaner supply
2014-04-06 17:16:06 +01:00
Giacomand
ce8baeabb9 Fixes being able to change your chameleon jumpsuit's colour while dead.
Fixed an oversight with the red syndicate suits in the random uplink kit.
2014-04-06 15:16:22 +01:00
Rockdtben
f6906addb2 Merge pull request #3285 from Steelpoint/JaniBelt
Adds the janibelt!
2014-04-04 08:10:21 -05:00
Steelpoint
3fe2530086 Fix 2014-04-04 21:06:30 +08:00
Steelpoint
0f3acabbaa AmountChange 2014-04-04 20:40:12 +08:00
Steelpoint
1f4ff7204c More ALterations 2014-04-03 21:13:03 +08:00
Steelpoint
23a7847705 Alterations 2014-04-03 21:12:09 +08:00
Steelpoint
58cbe6ff98 One more alteration 2014-04-03 01:42:25 +08:00
Steelpoint
52a8aa3bfa Whoops! 2014-04-03 01:33:22 +08:00
Steelpoint
f45391a838 JaniBelt implementation 2014-04-03 01:30:02 +08:00
Firecage
8e67b38e40 Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-04-02 19:15:56 +02:00
Giacomand
e8d7526a0c Merge branch 'master' of https://github.com/Giacom/-tg-station into sec_maglite 2014-04-02 17:11:52 +01:00
Firecage
dabe951f56 Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-04-01 12:09:26 +02:00
Jordie0608
79746e115f Wooden Walls 2014-04-01 18:03:02 +11:00
Malkevin
0725ba44a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 2014-03-31 22:17:24 +01:00
Firecage
cd3773450b Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-03-31 20:56:34 +02:00
fleure
cccb3dcf76 Merge pull request #3226 from Giacom/syndicate_fab
Syndicate Suit Fashion
2014-03-31 19:35:45 +01:00
Firecage
79797afb6a Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-03-31 18:53:02 +02:00
Razharas
d1fbcf2457 Merge pull request #3227 from fleure/tankfix
Watertank nozzles no longer delete
2014-03-31 09:48:57 -07:00
Firecage
af00fd14bf Mimepack
This is a simple backpack for the mime.
2014-03-31 17:49:40 +02:00
MrPerson
2991dd72c9 More qdel() changes.
Move all atom/Destroy() behavior to atom/movable/Destroy() so turf/areas that get qdel()'d just get del()'d like they're supposed to. Also do tag = null, which should make more things GC.
Make cameras GC correctly and some misc grammar fixes.
Make smoke grenades GC.
Tell camera bugs to del() because I'm not working on complex behavior for one item.
2014-03-31 01:11:37 -07:00
Miauw
dc9ead6575 Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
Conflicts:
	code/_onclick/telekinesis.dm
	code/game/sound.dm
2014-03-30 20:48:03 +02:00
Giacomand
96912ce8dc Changed the replica suit/helmet to the black/red version.
Changed the description on the uplink datum.
Made all the suit/helmet names lowercase for all the different versions.
Changed the max_w_class to allow the suit to be inserted, won't allow anything else to be inserted due to the can_hold list not being empty.
2014-03-29 12:42:23 +00:00
fleure
c55ddd9d70 Watertank nozzles no longer delete 2014-03-29 12:35:58 +00:00