Commit Graph

9304 Commits

Author SHA1 Message Date
Rob Nelson
56d8ce28c8 Part 1 of economy rework: Spacecash refactor - See commit for full changelog.
* Implements stacking and stack overlays
 * Simplified tiers of cash (1,10,100,500,1000, may remove 500)
 * Simplified API (dispense_cash, count_cash)

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/admin/verbs/debug.dm
	code/modules/economy/ATM.dm
2014-04-19 20:47:41 -04:00
Duny
0acb55c296 Fixed Incendiary Mithocondria, nerfed Cryokinesis a bit
Incendiary Mithocondria now sets yourself on fire as intended instead of
doing nothing.
Cryokinesis now freezes you for a bit more than ten seconds and deals 20
damage instantly then around ten damage instead of the 30 seconds of
freeze and more than 40 damage over the duration it did before.

Conflicts:
	code/game/dna/genes/goon_powers.dm
2014-04-19 20:29:34 -04:00
ESwordTheCat
28b8001188 Implement it to grille.
Conflicts:
	code/game/objects/structures/grille.dm
2014-04-19 20:00:15 -04:00
ESwordTheCat
c43652b33a Okay shards converted to pool usage now.
Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/objects/structures/displaycase.dm
	code/modules/mining/mine_turfs.dm
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
2014-04-19 19:57:53 -04:00
ESwordTheCat
907971e8ab Grille complete pooling. 2014-04-19 19:42:55 -04:00
ESwordTheCat
424df5eaf7 We object pool grille now. 2014-04-19 19:42:42 -04:00
ESwordTheCat
dde219a581 Object pooling immature implementation.
Conflicts:
	code/__HELPERS/experimental.dm
2014-04-19 19:42:04 -04:00
Rob Nelson
9227481a8a Standardize windows.
Conflicts:
	code/WorkInProgress/buildmode.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/twohanded.dm
	code/game/objects/structures/window.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-04-19 19:36:33 -04:00
VelardAmakar
dc6f794368 Adds the ability to construct, destroy, and take apart bookcases.
Bookcases can be built using 5 wood planks.
Bookcases can be destroyed using weapons(50HP).
Bookcases can be taken apart using a wrench.
2014-04-19 19:13:33 -04:00
fleure
0dcee05ab2 Watertank nozzles no longer delete
Conflicts:
	code/game/objects/items/weapons/tanks/watertank.dm
	code/modules/mob/mob_helpers.dm
2014-04-19 18:17:49 -04:00
Ccomp5950
66f3d8ab75 Say code rewrite, Silicon jerks now using new saycode.
Tracking added for AI's and Observers

Instead of calling GetVoice() over and over for everyone that can hear you we're checking a variable that is updated with Life()

removed a bunch of my debug verbs.

Conflicts:
	code/game/machinery/telecomms/broadcaster.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/living/silicon/say.dm
2014-04-19 17:04:29 -04:00
Ccomp5950
9dab2ad8a1 Saycode rewrite initial commit.
Create structure for modular saycode

Regular chat:
specific_paths/say() -> living/say() -> specific_paths/hear_say()

Radio chat:
specific_paths/say() -> Telecoms shit -> specific_paths/hear_radio()

Humans done.

Todo:  AI, Robot, simple_animal, and ghosts.

Conflicts:
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/telecomunications.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/say.dm
2014-04-19 16:54:16 -04:00
DJSnapshot
e1af1f4713 replaced electrodes with insta hit taser beams.
Conflicts:
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/projectile/beams.dm
	icons/obj/projectiles.dmi
2014-04-19 16:28:23 -04:00
Jarcolr
abdcf82123 Kicking a grille does 2 less damage; fix for #4557
It will now take 10 hits to destroy it without using a weapon or tools.

Take that,metagamers!
2014-04-19 16:06:09 -04:00
Jarcolr
b5056c5441 Cannot wash your missing hands anymore
M as mob changed to user as mob; don't know why it was shortened to 1 letter,but eh.
Conflicts:
	code/game/objects/structures/watercloset.dm
2014-04-19 16:01:51 -04:00
Jarcolr
935576f5c4 Can no longer use fire extinguisher closet without hands
If you did not have hands,you could click on a emergency closet and have it spawn in your hand,and it would stay there,floating.
Cool,right?
2014-04-19 15:53:33 -04:00
RavingManiac
f80d1e702b Missing files added. 2014-04-19 15:51:27 -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
GinjaNinja32
032f6fb762 Add colour to AI private channel (144.7)
Changes the AI private channel colour to magenta (#ff00ff), and changes
the marker from [144.7] to [AI Private].

Magenta is far enough from the Science channel (#993399) to be obvious,
but I'm open to alternative suggestions.

Conflicts:
	code/stylesheet.dm
2014-04-19 15:44:48 -04:00
Jeremy Liberman
f43ef06431 Virology - NanoUI, gameplay tweaks, bugfixes
Conflicts:
	.gitignore
	code/game/machinery/kitchen/smartfridge.dm
	code/game/machinery/machinery.dm
	code/modules/food/recipes_microwave.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/virus2/isolator.dm
	nano/js/nano_base_helpers.js
2014-04-19 15:42:49 -04:00
alex-gh
f93c7d320a Merge pull request #181 from alex-gh/objective_fixes
Objective fixes
2014-04-18 07:30:01 +02:00
alex-gh
d30973b932 Tweaked traitor probabilities 2014-04-18 07:20:59 +02:00
alex-gh
94d649dbe6 Reworked 'speciesist' objective 2014-04-18 07:17:36 +02:00
alex-gh
97aa7163c5 Merge pull request #180 from alex-gh/objective_fixes
Various fixes for the objective system
2014-04-17 04:04:58 +02:00
alex-gh
6dbe28ee14 Protect objective should select other traitors now 2014-04-17 03:28:38 +02:00
Necaladun
cdb0a47d0b Fix satchels
I herped a derp and broke satchels
2014-04-16 16:26:38 +09:30
Necaladun
8796a5b273 Fixed spacelaw
no longer 404
2014-04-16 12:57:39 +09:30
Necaladun
587de30588 AI law fix
Changed AI laws in the modules to say crew or organics
2014-04-15 00:29:00 +09:30
ZomgPonies
b50449e849 Merge pull request #178 from alex-gh/ServerCode
Server code
2014-04-14 08:39:36 -04:00
Walter0o
dad64c9f90 Fixes a critical exploit with the autolathe.
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 12:47:57 +02:00
Necaladun
c199a41b21 item and map
Custom items for mark and the map uploaded
2014-04-13 15:09:27 +09:30
alex-gh
9eeb616962 rebalanced Borg/mounted RCD 2014-04-09 22:52:31 +02:00
alex-gh
d55450f591 expanded find_target_by_role 2014-04-09 01:31:37 +02:00
alex-gh
7f6fc76f3d Added job name to 'debrain' objective 2014-04-08 18:26:07 +02:00
alex-gh
cfbfa0e993 Smoke rework caused endless loops, reverted. 2014-04-08 01:47:56 +02:00
alex-gh
521ad31671 Revert the new lighting system. 2014-04-07 23:51:35 +02:00
alex-gh
fe0411ac1b Merge branch 'genetics_instability' into ServerCode 2014-04-05 17:41:37 +02:00
Jeremy Liberman
c74ff2d653 Fixes biogenerator typo, improper beaker splashing, and allows glass beakers to refill botany trays
Conflicts:
	code/modules/reagents/reagent_containers/glass.dm
2014-04-03 21:42:33 +02:00
Loganbacca
0fba806c7b Chemsmoke rewrite
- Complete rewrite of the chemsmoke spawning code (everything that happens after the reaction to create the smoke).
- Moved it into it's own file since it's a little longer than the old one code-wise.
- Tweaked the smoke sprites; gave chemsmoke directions for more randomization, and tweaked the timing of their animations so they are smooth now.

Most of the code is documented, so you should be able to follow what's going on just reading through it. In short though:
- Chemsmoke now affects a circular area with a variable range depending on the total amount of chemsmoke created (no more 1-of-each-ingredient smoke grenades - sorry).
- The carried reagent volume in the cloud balances itself according to how big the affected area is (larger area, less carried reagent per turf).
- The carried reagent has more volume the closer you are to the centre of the cloud.
- The visual smoke effect scales with how big the affected area is.

Conflicts:
	code/game/objects/effects/effect_system.dm
	icons/effects/96x96.dmi
2014-04-03 18:21:26 +02:00
Chinsky
7f4388c5a3 Cleaned the fuck out of smoke.
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/objects/effects/effect_system.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/organs/organ_external.dm
2014-04-03 18:18:04 +02:00
SamCroswell
514ac5aeb0 Merge pull request #9 from ZomgPonies/master
Update
2014-04-01 12:47:14 -04:00
alex-gh
2de66f51c8 Rebalanced power stacking.
Active powers will now slowly give you clone damage. This should discourage power stacking.
2014-03-30 15:56:12 +02:00
alex-gh
3132b7f277 Added speciesist objective 2014-03-24 08:54:40 +01:00
alex-gh
f0c7296b5d Blob balance tweaks.
Blob will now eat items placed on it.
Blob does not produce light anymore (take that dionas)
Shield blobs now have same brute resist as normal blobs
Attempted to lower the CPU load of the "Pulse" proc.
2014-03-24 02:46:47 +01:00
alex-gh
b7eb15b120 Hostile mobs will now destroy windoors 2014-03-24 02:26:27 +01:00
alex-gh
ec14398231 Blob announcement changes. 2014-03-24 01:17:15 +01:00
Segrain
5a1a9cb14d Fix for #4589.
Conflicts:
	code/game/machinery/doors/airlock.dm
2014-03-24 01:09:58 +01:00
Mloc-Argent
be2932fd87 Fixes #4589
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-03-24 01:07:26 +01:00
alex-gh
1482e1cd91 Removed the steal coin objective: We have no mint and no money bags 2014-03-24 00:44:35 +01:00
alex-gh
fd65367f41 Added an objective to protect other traitors 2014-03-24 00:40:58 +01:00