Commit Graph

850 Commits

Author SHA1 Message Date
mwerezak
264595d178 Fixes tails not rendering in record photos 2014-06-18 22:17:05 -04:00
ZomgPonies
37e975fcc8 Merge pull request #261 from Bone-White/master
Pickpocket Gloves fix
2014-06-18 06:34:37 -04:00
Bone White
89b8a002bf Pickpocket Gloves fix
They can now take/place ids without notifying, and ids enter the
pickpocket's hand instead of dropping to the floor or not working.
2014-06-18 11:04:33 +01:00
ZomgPonies
86a4274a3f add_logs runtime fix 2014-06-17 04:19:41 -04:00
ZomgPonies
c5e6f8c070 Runtime fix logging electrifying airlocks 2014-06-17 00:14:04 -04:00
mwerezak
e9171a9ae3 Adds docking support to shuttles, NanoUI
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/airlock_control.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/modules/shuttles/shuttle.dm
	nano/css/shared.css
2014-06-14 04:10:39 -04:00
ZomgPonies
866c84a3d3 Moar addiction fixes 2014-06-09 17:51:05 -04:00
ZomgPonies
2c57ec96ae First commit of the addiction system 2014-06-08 21:55:03 -04:00
Zuhayr
31a1b6e526 Fixes #5098
Conflicts:
	code/game/objects/items/weapons/tools.dm
	code/modules/power/cable.dm
2014-06-01 13:29:18 -04:00
Zuhayr
777e31e222 Fixes #4973
Conflicts:
	code/datums/spells/ethereal_jaunt.dm
2014-06-01 13:26:20 -04:00
alex-gh
1dba2dd59d Merge pull request #235 from alex-gh/uplink_greentext
TC use count appears on round end
2014-05-30 20:30:05 +02:00
ChuckTheSheep
7491cd7b65 TC use count appears on round end
Conflicts:
	code/datums/uplink_item.dm
	code/game/objects/items/devices/uplinks.dm

Adds Icons and purchase list

Conflicts:
	code/datums/uplink_item.dm
	code/game/gamemodes/traitor/traitor.dm
	code/stylesheet.dm

CSS is hard

Conflicts:
	code/game/gamemodes/traitor/traitor.dm

Mah Indents

Made Purchase Log Text rather than List

Conflicts:
	code/game/objects/items/devices/uplinks.dm

Moved images to top "survived" line

Conflicts:
	code/game/objects/items/devices/uplinks.dm

Boxes show contents

Nuke Ops Group Shaming

Conflicts:
	code/game/gamemodes/nuclear/nuclear.dm

Uses compiled list for uplinks

Conflicts:
	code/game/objects/items/devices/uplinks.dm
2014-05-30 20:28:35 +02:00
ZomgPonies
c470beb5c9 New recipes 2014-05-30 14:27:58 -04:00
ZomgPonies
06bbfcf150 Final Nations patch before live testing. This is going to be painful. 2014-05-27 20:09:10 -04:00
ZomgPonies
9d45361f9b 3rd nations commit, moved nations to datums to make things easier down the line. 2014-05-27 00:20:39 -04:00
mwerezak
cb5ffe6d2c Forgot to add VV menu entry for give_disease2 2014-05-26 06:12:21 -04:00
Walter0o
198b4863b6 fixed crafting_master hook
when world.dm got changed from calling the setup procs itself to using hooks,
crafting was overlooked.

why are all commits not tested beforehand in a dev branch ?
2014-05-25 18:23:48 +02:00
ZomgPonies
dd298e4dda Fix invisible containers for inflatable shit 2014-05-25 05:34:48 -04:00
Mloc-Argent
1b2f83dee4 BS12 Hooks 2014-05-22 23:56:35 +02:00
ZomgPonies
f0ebf536c9 Renamed Atmos Tech to life support specialist due to new grav gen responsabilities 2014-05-20 16:12:36 -04:00
Zuhayr
3c03012fee Hopefully fixes the double push bug. 2014-05-17 20:59:56 -04:00
Rob Nelson
e7d4c1db14 OH GOD YOU CAN BUILD PODS NOW OH GOD
Conflicts:
	code/datums/helper_datums/construction_datum.dm
	code/game/machinery/constructable_frame.dm
	code/game/mecha/mech_fabricator.dm
	code/game/mecha/mecha_construction_paths.dm
	code/game/mecha/mecha_parts.dm
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
2014-05-17 19:05:08 -04:00
Rob Nelson
a2cfa562b3 Fix UI syringes not setting UI flag correctly. 2014-05-15 20:10:47 -04:00
jack-fractal
b1af8d1a6a fixing the traitor panel 'make cultist' function 2014-05-15 05:16:22 -04:00
jack-fractal
05da6ed973 adding modifications to cult mode, working spirits, and mask transformation procs
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_movement.dm
2014-05-15 05:16:13 -04:00
jack-fractal
2754b56e0c adding the spirit entity code, fixing the cameraNet so that it compiles properly
Conflicts:
	code/datums/visibility_networks/dictionary.dm
	code/game/machinery/doors/door.dm
	code/modules/mob/living/silicon/ai/freelook/cameranet.dm
2014-05-15 05:06:38 -04:00
jack-fractal
3df35fe03c modifying visibility interface of ai to use generic visibility_interface
Conflicts:
	baystation12.dme
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/modules/mob/living/silicon/ai/freelook/cameranet.dm
	code/modules/mob/living/silicon/ai/freelook/chunk.dm
	code/modules/mob/living/silicon/ai/freelook/eye.dm
	code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
2014-05-15 04:43:49 -04:00
jack-fractal
466070e10f adding the visibility network datums 2014-05-15 04:16:37 -04:00
alex-gh
b6b5e0a9fc Changed drone laws to be more VG like 2014-05-13 02:44:31 +02:00
alex-gh
55ca21058d Added more default laws 2014-05-13 01:35:15 +02:00
Zuhayr
d606d774d8 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.
Conflicts:
	baystation12.dme
	code/controllers/configuration.dm
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/examine.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/recycling/disposal.dm
	icons/mob/robots.dmi
	icons/obj/device.dmi
2014-05-12 01:41:02 -04:00
Razharas
4b2deebec6 Making datum handling not suck balls too hard
Yeah now it can roughly be called okish
2014-05-04 22:56:38 -04:00
Razharas
9763c1349b Fixes for menus and abuses
No more shit and giggles
2014-05-04 22:56:19 -04:00
Razharas
95b6406adb Makes this shit actually work
Yeah, also added crafting controller to debug controllers(who will need
to debug crafting, but whatever)

Conflicts:
	code/controllers/verbs.dm
2014-05-04 22:55:42 -04:00
Razharas
3d762cd892 Readded the crafting to tables
Well at least now i can brag about how you can do this with just few
lines

Conflicts:
	code/game/objects/structures/tables_racks.dm
2014-05-04 22:54:08 -04:00
Razharas
61359f74af Readding the old recipes, as examples
Not sure if it will help, but hope so
2014-05-04 22:47:59 -04:00
Razharas
281fbc7648 Made crafting entirely datum
Now it can be useful
Maybe
Probably
I hope

Conflicts:
	code/_globalvars/lists/objects.dm
	code/game/atoms.dm
	code/game/objects/structures/tables_racks.dm
2014-05-04 22:47:38 -04:00
SamCroswell
2081699e54 Bullet damage tweaks
Upped the L6's bullet damage due to how high the cost of it is. Subject
to change, as always.
2014-05-04 11:01:39 -04:00
SamCroswell
740991092a Nukeops Weapons Rework
Nukeops now start with a Stechtkin Pistol instead of the C-20r.
In addition, they now have more items available to purchase in their
uplink (Exclusive to Nukeops). They are as follows:
C-20r - 6TC
L6SAW - 10TC
C-20r Mag - 1TC
L6SAW Mag - 3TC
Stechtkin Silencer - 1TC
Advanced Medkit - 3TC

The prices are, of course, subject to change as we observe further
Nukeops rounds.
2014-05-04 10:24:48 -04:00
SamCroswell
39670bf97a Ninja Greentext Fix 2014-05-03 20:52:07 -04:00
suethecake
10b7a2e8d9 Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY!
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/living/carbon/species.dm
	code/setup.dm
2014-04-29 13:58:56 -04:00
ZomgPonies
1ebe9f34e9 Solar fixes 2014-04-27 17:39:56 -04:00
ZomgPonies
1cdbe818ad tg's solars update 2014-04-22 09:46:36 -04:00
ESwordTheCat
37bcc29ca5 Opacity is more realistic than density. 2014-04-19 20:21:59 -04:00
RavingManiac
a06f8b910c Inflatable barrier boxes added to engineering. Inflatable barrier crates can be ordered by the QM. Briefcase icon_state fixed.
Conflicts:
	maps/backup/tgstation-redux-WIP.dmm
2014-04-19 15:51:07 -04:00
alex-gh
3132b7f277 Added speciesist objective 2014-03-24 08:54:40 +01:00
Rob Nelson
aa9b0a3a48 Nerf hulk.
Conflicts:
	baystation12.dme
	code/datums/spells/genetic.dm
2014-03-20 13:15:58 -04:00
Heredth
5d77dcecaa Added new vending machines, and changed a couple of other files. Might be worth looking through just to make sure I didnt fuck everything up
Conflicts:
	code/game/machinery/vending.dm
2014-03-11 06:11:12 -04:00
Ccomp5950
1e5514e27e Code effeciency project: HUD items rewrite
Before: Every tick each HUD item would recalculate and redo images for every mob in view. For items like the secHUD where we're transversing implants and the various records this gets very expensive.

After: Mobs use their hud_list variable to store varius huditem images, when conditions change for those specific huditem images it updates the specific ones on demand. As a backup every 30 ticks or so the mob will update all of their hud_list.

Also: moved proc/RoundHealth() from 2 seperate locations into __HELPERS/mobs.dm

Conflicts:
	code/__HELPERS/mobs.dm
	code/game/objects/items/weapons/implants/implanter.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defines.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/virus2/helpers.dm
	code/setup.dm
	icons/mob/hud.dmi
2014-03-10 08:07:29 -04:00
Ccomp5950
cd201dc3a5 NanoUI Optimizations.
We won't regenerate the list for Manifests every tick while viewing the manifest, instead we have a global variable for it PDA_Manifest that we Cut() if there is a change to the manifest then when the next player goes to view the manifest on their PDA it will recreate the list that one time.

Some sections of the PDA will no longer auto-refresh every tick because...well that's dumb.

Modes that will no longer autoupdate at all:  Viewing medical/sec records, viewing notes (will update when you change them of course), and the station alert menu.
Modes that will only autoupdate every 5 ticks:  APC list (Because it's a huge fuck off list), the manifest, mulebots and secbots screens, supply requests/orders, and janitor supply locator)

Some other things that I just can't remember right now.

Conflicts:
	code/defines/obj.dm
2014-03-04 00:37:44 -05:00