Commit Graph

14247 Commits

Author SHA1 Message Date
Kearel 4140a1d5ee Icon update, variables added
Bikes are now based off variables, for easy child-making and for admins
to change values.
2015-08-16 23:42:16 -05:00
Zuhayr 3f833f2b24 Reimplemented floor lights as a machine built at the autolathe. 2015-08-16 19:26:17 -07:00
SinTwo 5b1b79df6d Fixes/Adds AS-24 Shotgun 2015-08-16 21:36:36 -04:00
Zuhayr 3b712adb5f Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes. 2015-08-16 17:51:19 -07:00
Zuhayr 23e9c7d4c9 Merge 2015-08-16 17:10:11 -07:00
SinTwo 14b2114598 AS-24 Shotgun
Adds the AS-24 Shotgun.
2015-08-16 19:28:06 -04:00
PsiOmega 4d826e68cb Mob bump fixes.
ED-209 is considered massive enough to not bump easily.
update_canmove() no longer unconditionally sets mob density. Fixes #10365. Fixes #10682.
2015-08-16 20:55:02 +02:00
Hubblenaut d2e2574f07 Merge remote-tracking branch 'upstream/dev' into dev 2015-08-16 20:39:50 +02:00
SomeoneElse 9b547608f6 [minor] Fix research design item path definition, usage of TECH_* macros
code/modules/research/designs.dm:
	fixed path definition of `datum/design/circuit/shield`
	fixed req_tech variable to now use TECH_* macros
2015-08-17 00:25:37 +06:00
mwerezak b21bd0c42d Ports fix for #10660 from vg
Courtesy of PJB3005
2015-08-16 14:24:44 -04:00
GinjaNinja32 f0c9f16099 Merge pull request #10677 from PsiOmegaDelta/150816-SynthSay
Synth say fixes.
2015-08-16 14:55:04 +01:00
GinjaNinja32 0fe3c6e926 Merge pull request #10678 from PsiOmegaDelta/150816-PrivateSay
Makes the private AI channel truly private.
2015-08-16 14:53:38 +01:00
PsiOmega 21fd8d825d Makes the private AI channel truly private. 2015-08-16 15:43:28 +02:00
Zuhayr c72a746f20 Compile fixes. 2015-08-16 06:29:04 -07:00
PsiOmegaDelta c1eba26d8a Holo-decals and fixes.
Adds more holodeck decals.
Allows overlays to be glued unto unsimulated turfs.
Ensures holo-stools use an existing icon state.
2015-08-16 06:09:15 -07:00
mwerezak de6e878411 Fixes floorbots, floor attackby flooring setting, and adjusts a few flooring names.
Made set_flooring take a flooring instance, in case calling code already
had a flooring instance it seemed wasteful to have to look up the
flooring all over again.
2015-08-16 06:09:09 -07:00
Zuhayr 49575a1e35 Blocked out the holodeck tiles. 2015-08-16 06:07:45 -07:00
Zuhayr b43b396154 Updates instances/tiles for Centcomm. 2015-08-16 06:07:44 -07:00
Kelenius 7c1d9b5614 Mech chargers are now a single machine
Can be built and upgraded
Resolves #5215
2015-08-16 06:07:36 -07:00
Zuhayr c8baafed2a Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and
construction/deconstruction. Major map rework/changes.
2015-08-16 06:05:21 -07:00
Kelenius bb915a2c34 Reverts #10649, fixes #10621 2015-08-16 06:04:39 -07:00
Kelenius abf2bea2f0 Fixes #10599 2015-08-16 06:04:38 -07:00
PsiOmega 0b01482eb6 Synth say fixes.
Adds synth message sanitizing. Fixes #10667.
Makes sure say() code at least to some degree returns expected values. Fixes #10675.
2015-08-16 14:00:29 +02:00
Zuhayr 0c2d0852ae Merge pull request #10666 from PsiOmegaDelta/150815-RoundDuration
Round Duration display
2015-08-16 03:40:23 -07:00
PsiOmega 13076b6f55 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-16 10:32:06 +02:00
PsiOmegaDelta 7b5b7162d0 Merge pull request #10673 from Baystation12/master
Dev-freeze
2015-08-16 10:30:13 +02:00
PsiOmegaDelta 311dbcb0f0 Merge pull request #10658 from mwerezak/chem-fix
Fixes overdose not working for ingested reagents
2015-08-16 10:18:16 +02:00
GinjaNinja32 7dc85cfdd4 Merge pull request #10040 from PsiOmegaDelta/150707-MoreOverlaysFewerStates
Computers are now overlay based.
2015-08-16 00:40:47 +01:00
mwerezak 77ddae4e26 Structures now take damage properly from projectile clouds 2015-08-15 19:08:45 -04:00
Zuhayr eccdfd8d9a Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2015-08-16 05:45:16 -07:00
Zuhayr 7e8713039a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-16 05:40:47 -07:00
PsiOmega 1186ec2af6 The stat panel now displays station time along with current round duration. 2015-08-15 22:09:18 +02:00
Chinsky 7241c2f2d1 Merge pull request #9947 from mwerezak/breacher
Makes unathi breachers fit unathi only
2015-08-15 22:04:36 +03:00
mwerezak 5f98346ab5 Fixes overdose not working for ingested reagents 2015-08-15 10:22:07 -04:00
PsiOmega c51e208094 One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686. 2015-08-15 15:22:37 +02:00
Karolis2011 84a9fd2927 Removed ingame capture link generation and fixed some bugs. 2015-08-15 14:04:25 +03:00
Kelenius cb5df3963a Reverts #10649, fixes #10621 2015-08-15 13:15:52 +03:00
Kelenius 3b29856694 Fixes #10599 2015-08-15 13:04:57 +03:00
Karolis2011 9ea9490332 Added map capture function. 2015-08-15 12:39:07 +03:00
PsiOmega 4cf736bb5c Compilation fix. 2015-08-15 11:12:43 +02:00
PsiOmega c81ad0964e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2015-08-15 11:06:03 +02:00
PsiOmega 395df6d9c2 Compilation fixes. 2015-08-15 10:58:32 +02:00
PsiOmega cda0ecfa97 Relocates Malfunction code to appropriate location. 2015-08-15 10:52:39 +02:00
PsiOmega 3a08e2884a Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm
2015-08-15 10:52:17 +02:00
mwerezak 8b08f8ff34 Fixes explosions deleting projectiles 2015-08-15 02:51:02 -04:00
mwerezak 4092b40ae5 Updates frag grenades to use bresenham, tweaks 2015-08-15 02:41:32 -04:00
HarpyEagle 6404d02c38 Adds changelog and tweaks PTR penetration. 2015-08-15 02:19:23 -04:00
Snapshot 3b7ed9bdc4 Merge pull request #10649 from mwerezak/coffee-fix
Fixes #10621
2015-08-14 22:51:43 -07:00
Snapshot 5f5671d21f Merge pull request #10647 from mwerezak/acids
Fixes #10645
2015-08-14 22:22:41 -07:00
mwerezak 3163de7a50 Fixes #10621
Coffee now adds jittery as an overdose effect. Set overdose so that drinking two full cups in one go (60 units) will result in 150 jitteriness.
2015-08-14 23:44:46 -04:00