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
31cfe0ba80
Merge pull request #3378 from Donkie/jobrefactor
...
Jobcode refactoring TAKE TWO
2014-04-09 13:52:37 -05:00
30bb6c8814
Generalised ID naming
2014-04-09 18:49:59 +02:00
f44e3ffbf1
Merge pull request #3244 from MrPerson/qdel_tweaks_3-31-14
...
More qdel() changes
2014-04-08 15:37:44 -07: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
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
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
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
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
f6906addb2
Merge pull request #3285 from Steelpoint/JaniBelt
...
Adds the janibelt!
2014-04-04 08:10:21 -05:00
3fe2530086
Fix
2014-04-04 21:06:30 +08:00
0f3acabbaa
AmountChange
2014-04-04 20:40:12 +08:00
1f4ff7204c
More ALterations
2014-04-03 21:13:03 +08:00
23a7847705
Alterations
2014-04-03 21:12:09 +08:00
58cbe6ff98
One more alteration
2014-04-03 01:42:25 +08:00
52a8aa3bfa
Whoops!
2014-04-03 01:33:22 +08:00
f45391a838
JaniBelt implementation
2014-04-03 01:30:02 +08:00
8e67b38e40
Merge branch 'master' of git://github.com/tgstation/-tg-station.git
2014-04-02 19:15:56 +02:00
e8d7526a0c
Merge branch 'master' of https://github.com/Giacom/-tg-station into sec_maglite
2014-04-02 17:11:52 +01:00
dabe951f56
Merge branch 'master' of git://github.com/tgstation/-tg-station.git
2014-04-01 12:09:26 +02:00
79746e115f
Wooden Walls
2014-04-01 18:03:02 +11:00
0725ba44a4
Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
2014-03-31 22:17:24 +01:00
cd3773450b
Merge branch 'master' of git://github.com/tgstation/-tg-station.git
2014-03-31 20:56:34 +02:00
cccb3dcf76
Merge pull request #3226 from Giacom/syndicate_fab
...
Syndicate Suit Fashion
2014-03-31 19:35:45 +01:00
79797afb6a
Merge branch 'master' of git://github.com/tgstation/-tg-station.git
2014-03-31 18:53:02 +02:00
d1fbcf2457
Merge pull request #3227 from fleure/tankfix
...
Watertank nozzles no longer delete
2014-03-31 09:48:57 -07:00
af00fd14bf
Mimepack
...
This is a simple backpack for the mime.
2014-03-31 17:49:40 +02:00
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
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
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
c55ddd9d70
Watertank nozzles no longer delete
2014-03-29 12:35:58 +00:00
9fb84160c8
Replaced all the red syndicate space suits with the red/black version, including the uplink item. It looks cooler.
...
You can now put the syndicate suit back into the box it came in.
Gave the DJ Station the orange syndicate suit, looks very nice.
Replaced the syndicate suit in the derelict's singularity engine with the yellow/black engie version.
Replaced the other syndicate suit in the derelict with the red/black version.
Added a red/black space suit to the abandoned mining station, inside the resin corridor, along with a syndicate toolbox.
Moved the xeno suit to the hydro room, on the abandoned mining station. It looked out of place out in the open.
Moved the SWAT helmet on the derelict to the derelict armoury.
2014-03-29 12:00:23 +00:00
f2bfa3f5d4
Renamed maglite to seclite.
...
Refactor'd can_hold and cant_hold to use type paths instead of strings.
Removed an undefined object from the medical belt's can_hold list.
2014-03-29 11:10:35 +00:00
cc1d87afcf
Adds the maglite. Security spawns with it in their sec belts. They have a decent force value and are a little better than the common flashlight. Sprites by Nienhaus. Can be held in the sec belt and the armour vest.
2014-03-29 00:54:50 +00:00
3ff519cefc
Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
...
Conflicts:
code/modules/mob/mob.dm
2014-03-28 10:51:48 +00:00
febfa4d1e5
Merge branch 'qdel-with-datums'
...
Conflicts:
code/_onclick/hud/screen_objects.dm
code/controllers/garbage.dm
code/game/atoms.dm
code/game/objects/items/weapons/storage/storage.dm
code/modules/mob/mob.dm
2014-03-27 21:46:53 -04:00
cd6c1272ad
Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
2014-03-27 13:18:46 +00:00
990ed20873
Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
...
Conflicts:
code/modules/mob/mob.dm
2014-03-26 18:38:07 +00:00
e5f0165d0d
Merge branch 'master' of https://github.com/tgstation/-tg-station into avoiddrama_codemagic
...
Conflicts:
code/datums/spells/charge.dm
code/modules/projectiles/ammunition/special.dm
code/modules/projectiles/guns/magic/staff.dm
2014-03-26 13:03:12 -04:00
8af8a43d6f
Initial pass to convert LF to CRLF
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
2014-03-24 08:53:40 +00:00
3656217c29
Modified qdel() to accept any datum.
...
The garbage controller no longer bothers nulling out every variable on destroyed objects.
An object can opt to not be collected by returning true from Destroy(). Useful for pools or other edge cases.
Fixed boxes not being collected, along with a couple other things.
Turfs will not be monitored for collection.
generate_ion_law() is no longer a /datum proc, and I am an admin in the repo. Deal with it.
2014-03-24 00:10:43 -04:00
542da7d73b
Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/wizard/soulstone.dm
2014-03-22 21:01:09 +00:00
a80dd4df0f
Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
...
Conflicts:
code/game/objects/items/weapons/AI_modules.dm
2014-03-22 17:42:07 +01:00
ee716586b9
GEE THANKS GIA FOR MORE CONFLICTS (gravitygen changes to c4 vs qdel)
...
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
Conflicts:
code/game/objects/items/weapons/explosives.dm
2014-03-21 19:04:51 -07:00
4c4cadb48c
Merge pull request #3086 from Giacom/gravity_generator
...
[MAP] Added a new gravity generator which will produce gravity for the station.
2014-03-21 14:06:40 -07:00
6930283efc
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
...
Conflicts:
code/game/gamemodes/changeling/changeling_mutations.dm
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/malfunction/Malf_Modules.dm
code/game/objects/items/weapons/tanks/watertank.dm
code/game/objects/structures/tables_racks.dm
code/modules/research/server.dm
2014-03-21 03:05:39 -07:00
5665966c94
cult.dm - made the objectives always be declared in ticker.mode
...
changed the var name from objectives to cult_objectives
cultists hitting mobs (and only mobs) will convert any holy water to unholy water
trying to summon narsie when shes not an objective will dose all the summoners with hell water
chaplain with his bible can purify the unholy water in a container
wrote the sac act for corgis - this will cause !!FUN!! to the sacrificer
Holy water will deconvert cultists now, takes around 2 minutes
Unholy water generally buffs cultists, but causes brain damage. Its very poisonous to non-cultists.
Hell water - this is a punishment reagent, amongst other bad affects chiefy it (re)sets people on fire
Misc: Fixed hyperzine being double consumed.
2014-03-21 00:03:42 +00:00
d2021e1bcd
Merge pull request #3107 from Jordie0608/dancefloorisbetterthantheprancefloor
...
Fixes wirecutters and multitools lacking attack sounds
2014-03-20 11:19:14 -05:00
a5a9c2fd68
Changed mousetrapbox desc to span
2014-03-18 15:08:49 +11:00
33e6f3f3c8
Screw off crowbar_red leave me alone
2014-03-18 11:29:46 +11:00
Jordie0608
Cheridan
Daniel
Razharas
Miauw
MrPerson
fleure
Giacomand
Rockdtben
Steelpoint
Firecage
Malkevin
YotaXP
Incoming
Mloc-Hibernia