Commit Graph

1378 Commits

Author SHA1 Message Date
Hubblenaut
eb23c44c8a Removes explosive implants from nuke ops 2014-06-01 20:15:39 +02:00
Zuhayr
825a77b702 Fixes end of round drone spam. 2014-05-31 15:38:10 +09:30
Mloc-Argent
3d2cc3cd82 Revert "Merge pull request #4985 from jack-fractal/dev"
This reverts commit 1679b4062f, reversing
changes made to b149b273d9.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/datums/visibility_networks/update_triggers.dm
2014-05-31 00:25:56 +01:00
Hubblenaut
e28ce8a366 Removed all prefixes of type 'paper - ' 2014-05-23 22:31:27 +02:00
Loganbacca
7d75f6432d Fixed doubled construct spells
Constructs were being assigned duplicated spell lists when spawned from soulstones
2014-05-18 19:52:03 +12:00
jack-fractal
1bd866239f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/doors/door.dm
2014-05-13 20:45:05 -04:00
Mloc-Argent
a2b85c31a4 Merge remote-tracking branch 'upstream/master' into dev 2014-05-07 17:37:29 +01:00
Zuhayr
c44e7b0e56 Fixes #4495. 2014-05-05 16:14:59 +09:30
Ccomp5950
976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
2014-04-25 21:14:58 -05:00
Ravensdale
a72f8d3ded Spelling correction: tratior and Tratior to traitor and Traitor 2014-04-22 01:12:17 -07:00
Ravensdale
68eda5201b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
2014-04-16 21:44:26 -07:00
Ravensdale
1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
Ravensdale
a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Ravensdale
e6c3fbf071 Changes all appropriate instances of 'Plasma' to 'Phoron' 2014-04-10 01:19:49 -07:00
Chinsky
06fd99b9ba Merge pull request #4723 from Jarcolr/diction
Fixes some typos and descriptions
2014-04-09 21:48:19 +04:00
Jarcolr
5ca99dabe7 Adds an additional \ 2014-04-09 14:06:52 +03:00
Jarcolr
868dea5681 Grammar patch 1
This is just the first one of many.
2014-04-08 14:48:31 +03:00
SparklySheep
341f8570e4 Changeling Rebalances
As discussed here: http://www.baystation12.net/forums/viewtopic.php?f=5&t=10001
2014-04-07 14:34:27 -05:00
Ccomp5950
5933496ad0 Merge pull request #4696 from Jarcolr/epsilon
Removes unfat sting from changeling evolution menu
2014-04-06 00:16:42 -05:00
Jarcolr
925cb02ef7 Removes useless unfat sting from evolution menu
Also fixed a typo; but meh.

No point in having to use points on something that has no use.
2014-04-05 10:20:54 +03:00
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
Graham Lloyd
eae613d928 Fixes malf picking players to me malf who don't have BE_MALF toggled on. 2014-03-31 15:39:49 -04:00
Ccomp5950
2027892395 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-03-28 18:48:05 -05:00
Ccomp5950
56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
2014-03-28 18:46:04 -05:00
Mloc-Hibernia
d4324901d3 Revert "Merge pull request #4478 from Aryn/master"
This reverts commit 86941a58f0, reversing
changes made to 65b8215ec7.
2014-03-24 13:55:41 +00:00
iamgoofball
6fa4084d11 Adds 9 new Chameleon items.
Chameleon Glasses, Exosuit, Gloves, Shoes, Hat, Gun, Mask, Backpack, and Gun.

The Gun does 1 damage and can disguise as any gun. As long as you don't fire it people won't notice that it shoots 1 damage rubber bullets.

These new items come in the Chameleon Kit, which replaces and contains the Chameleon Jumpsuit
2014-03-23 14:08:23 -07:00
Ccomp5950
7000cce408 Admin Request: Logs now will end in CRLF on unix systems.
Also removed the "SERVER HAS CALLED FOR A VOTE" spam
2014-03-23 02:26:06 -05:00
Ccomp5950
ebc188c600 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/modules/mob/living/living.dm
2014-03-10 21:59:58 -05:00
ZomgPonies
b03493fbae Efficiency: Joblist
Conflicts:
	code/__HELPERS/global_lists.dm
2014-03-10 21:57:36 -05:00
Ccomp5950
084c0754ad 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
2014-03-09 10:25:36 -05:00
Ccomp5950
e8d04262a5 Merge pull request #4524 from Ravensdale/PROTECITON
Define spelling correction
2014-03-04 23:11:43 -06:00
Mloc
f4ca9631b5 Merge pull request #4504 from MrLeebo/severed-limbs-drop-cuffs
Fractures and severed limbs cause cuffs to fall off
2014-03-04 10:15:42 +00:00
Ravensdale
9561635942 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into PROTECITON 2014-03-03 20:26:58 -08:00
Ravensdale
50a45b32ae Fixes a define spelling error. 2014-03-03 20:23:21 -08:00
Jeremy Liberman
d41d3b2b9e Fixes UI glitch when losing cuffs from fractures, resisting, or cult magic 2014-03-02 15:08:55 -06:00
ZomgPonies
61fe10fe3d Efficiency: Joblist
Conflicts:
	code/__HELPERS/global_lists.dm
2014-03-01 13:38:55 -05:00
Ccomp5950
39383c331a Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-02-26 09:38:40 -06:00
Ccomp5950
c56ec21ee3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2014-02-26 09:34:38 -06:00
Ccomp5950
e098746209 Runtime fix: RP_Revolution's auto_add_rev_head loves that null.
runtime error: Cannot read null.client
proc name: process (/datum/game_mode/revolution/rp_revolution/process)
  source file: rp_revolution.dm,198
runtime error: Cannot read null.client
proc name: process (/datum/game_mode/revolution/rp_revolution/process)
  source file: rp_revolution.dm,198
runtime error: Cannot read null.client
proc name: process (/datum/game_mode/revolution/rp_revolution/process)
  source file: rp_revolution.dm,198
runtime error: Cannot read null.client
proc name: process (/datum/game_mode/revolution/rp_revolution/process)
  source file: rp_revolution.dm,198
runtime error: Cannot read null.client
proc name: process (/datum/game_mode/revolution/rp_revolution/process)
  source file: rp_revolution.dm,198
runtime error: Cannot read null.client
proc name: process (/datum/game_mode/revolution/rp_revolution/process)
  source file: rp_revolution.dm,198
2014-02-25 00:20:44 -06:00
Aryn
ca7d4026b8 Lighting system is too buggy to continue until I know wtf is going on 2014-02-24 05:58:09 -07:00
DJSnapshot
5690e2e4c7 Code cleanup for traitors 2014-02-15 23:42:37 -08:00
Rob Nelson
64f83c51ad And now tested in game, with some fixes. 2014-02-10 22:47:29 -06:00
Rob Nelson
fa20b9c2ee DNA2 Bug Fixes - Part 2 (CHERRY PICK)
We discovered that most of the problems were were having was because of BYOND passing lists (e.g. SE and UI) by-ref instead of the assumed by-val.

This commit adds dna.Clone() and (UI|SE).Copy() where needed.  These should be used where DNA or SE/UI lists are COPIED, otherwise changes made in the reference will affect the real strand.

This change also messes with the gene activation logic.

Conflicts:
	code/game/dna/dna2_domutcheck.dm
	code/game/dna/genes/powers.dm
2014-02-10 22:46:28 -06:00
Rob Nelson
a8d3c0601b And now tested in game, with some fixes. 2014-02-06 23:52:58 -08:00
Rob Nelson
3121e4fb2d DNA2 Bug Fixes - Part 2
We discovered that most of the problems were were having was because of BYOND passing lists (e.g. SE and UI) by-ref instead of the assumed by-val.

This commit adds dna.Clone() and (UI|SE).Copy() where needed.  These should be used where DNA or SE/UI lists are COPIED, otherwise changes made in the reference will affect the real strand.

This change also messes with the gene activation logic.
2014-02-06 23:07:35 -08:00
DJSnapshot
64ff444fa7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into antag
Conflicts:
	icons/mob/uniform.dmi
2014-02-04 23:55:27 -08:00
DJSnapshot
9c803dc1f6 Added the rest of the objectiveless antag types 2014-02-04 23:51:34 -08:00
DJSnapshot
3026a1306a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into antag 2014-02-04 15:10:13 -08:00
Segrain
55605624eb Gamemode autovote. 2014-02-03 04:43:38 +03:00
Segrain
b7059519c2 Merge remote-tracking branch 'upstream/master' into dev 2014-02-03 04:36:03 +03:00