Commit Graph
196 Commits
Author SHA1 Message Date
Zuhayr ee0d63a43d Merged with dev. 2015-02-24 17:03:39 +10:30
PsiOmega 5023fa4000 Ports /tg/'s starlight luminance.
Because configuration is initialized before the map we also don't have the same runtimes issues corrected by https://github.com/tgstation/-tg-station/pull/7806.
2015-02-23 10:11:46 +01:00
Zuhayr 2139884244 Dev merge. 2015-02-21 19:49:47 +10:30
Chinsky 81599a9203 Merge pull request #8175 from Kelenius/ofBorgsAndSynths
Adds robot synths
2015-02-21 11:43:39 +03:00
Kelenius 1c1e644f29 Adds robot synths 2015-02-19 21:04:27 +03:00
Zuhayr 728cb3cffa Working on vines. 2015-02-18 23:37:27 +10:30
mwerezak 57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -05:00
Zuhayr 3b7555c6e0 WIP 2015-02-14 23:43:52 +10:30
Zuhayr 08b26e8e4c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-11 14:35:58 +10:30
SkyMarshal dadea3c7fa Adds two admin weapons and refactors wall damage code.
The Icarus is now fireable in gun form.  The point defense mode fires several lasers one after the other so that it can penetrate.  The main gun mode fires a modified meteor.  Also added an "abstract weapon" which has the projectile type settable for admin shenanigans.
Walls now lack an armor variable, which is replaced with buffed health.  Normal walls take 4 shots with a normal laser or 5 emitter bursts to destroy.  Reinforced walls now take 20 normal laser shots or 28 emitter shots.
Added some proactive runtime protection to logging for projectile impacts.  Without a valid firer, the jump button is linked to the victim.
2015-02-08 04:01:35 -07:00
unknownandmwerezak 39b467c9da New bullet types, projectile rewrite
* Refactors projectile Bump()
* Converts projectile_type var strings to paths
* Reorganizes bullet projectile paths
* Made a pass through all the bullet_act() definitions. Mainly ensured that damage_type is checked when dealing damage to certain objects. Removed stupid /turf bullet_act() override, replaced with on_hit() overrides on the relevant projectiles.

* Adds shotgun pellets projectile. Adds Raptor's shotgun slug sprite.
* Gives stunshots more of their own identity, refluffs them as taser cartridges for shotguns. They still aren't obtainable anywhere unless spawned.
* Makes projectiles pass through girders and cultgirders with a certain probability, unless the girder itself was clicked.
* Projectiles are also able to pass through grilles. Low damage projectiles have a chance to be blocked by grilles. High damage projectiles have a chance to have some damage absorbed by the grille.
* Makes projectiles for blanks invisible.
* Adds flash bullet types
* Adds support for 'penetrating' projectiles
* Swaps .45 and 9mm projectile types. .45s hit slightly harder, 9mils have more ammo capacity.
2015-02-06 20:09:32 -05:00
Zuhayr c5e2feb5f1 Merge with dev. 2015-02-05 20:24:06 +10:30
Zuhayr 93cf4f73c5 More work on the vine system, fixing multiple bugs. 2015-02-04 10:52:48 +10:30
Zuhayr 0f126d2e54 Minor Entered() refactoring. 2015-02-04 10:49:53 +10:30
Zuhayr cd494cdef1 Added masking turf for asteroid field, fixed issues with distribution map. Replaced asteroid field with mask turf. 2015-01-23 13:40:05 +10:30
Kelenius d5c1c8672d Conflict fix 2015-01-20 15:02:25 +03:00
Zuhayr d466d740e4 Merge pull request #7886 from Baystation12/dev-freeze
Updating from dev freeze
2015-01-20 18:49:36 +10:30
Kelenius 5f496524d2 Changes how sprays work and re-adds silicate
Sprays will spray directly at solid objects if they are clicked (walls,
windows, etc).
Makes removal of wall rot with plant-b-gone actually work.
Re-adds silicate with the old recipe. It repairs windows and makes them
more damage-resistant up to half damage taken.
2015-01-17 19:11:41 +03:00
Mloc-Argent 4be653efec fix wall burning runtime, balance rwalls
rwalls are half as strong again because they took way too long
 to burn down

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2015-01-16 23:58:15 +00:00
Zuhayr d65c8f366e Merge pull request #7791 from Baystation12/dev-freeze
Dev freeze
2015-01-12 09:05:45 +10:30
Zuhayr 61d35bd474 Merge resolution. 2015-01-12 07:17:02 +10:30
Loganbacca a53922307b Fixed lying mobs not updating gravity state
Also removed a few colons from turf.dm
2015-01-11 22:43:15 +13:00
Loganbacca 146fb2f6ad Fixes lighting not updating when turfs are changed 2015-01-11 21:03:27 +13:00
ccomp5950 27765f799f Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
Conflict resolution.

Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
2015-01-06 12:36:28 -05:00
Zuhayr 81603032d3 Fixes #7671 2015-01-04 19:05:55 +10:30
Zuhayr af432c0c42 Merge pull request #7650 from Mloc/bs12-sleepyedges2
kludge for freezing zas, pending share_ratio fixes.
2015-01-04 07:51:45 +10:30
Mloc-Argent c55b7ec7c8 kludge for freezing zas, pending share_ratio fixes.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2015-01-03 21:16:12 +00:00
Zuhayr 982998d08d Fixes #7636 2015-01-03 06:53:29 +10:30
Zuhayr fc75f3bdfc Merge pull request #7620 from mwerezak/poster
Fixes #7598
2015-01-02 09:00:16 +10:30
mwerezak 6eceb15fe6 Merge remote-tracking branch 'upstream/dev-freeze' into poster
Conflicts:
	code/game/turfs/simulated/walls.dm
2015-01-01 15:46:23 -05:00
mwerezak 9485c6410c Fixes #7598 2015-01-01 15:43:28 -05:00
Zuhayr 5b578a1668 Merge resolution. 2015-01-01 22:59:54 +10:30
Zuhayr 1ea2acc24b Fixes #7392 2014-12-31 19:34:53 +10:30
mwerezak d240f6563d Throwing speed defines 2014-12-31 02:02:49 -05:00
mwerezak f17aa78d5f Less wall damage snowflake, allows obj throwers like crossbows and vox spike throwers to damage walls 2014-12-31 00:28:54 -05:00
Zuhayr 931682f926 Fixes #7327 2014-12-27 10:01:17 +10:30
Zuhayr 3997129390 Tidies up setup.dm, moves a bunch of vars to global.dm, changes the case of a couple. 2014-12-25 20:26:22 +10:30
Zuhayr bbfc6db0a3 Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right) 2014-12-23 17:38:05 +10:30
Mloc-Argent 7c7d35eded buff rwall health, change wall fire damage scaling.
Now uses a fancy log instead of whatever that thing was.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-21 20:36:59 +00:00
Mloc-Argent cf15517f8a fix up airless turfs to be actually airless
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-21 20:36:11 +00:00
Ccomp5950 8d65f8a87a Merge pull request #7175 from atlantiscze/pewPEWPEWboom
[Ready To Merge] Emitter update

or how I might learn to love the revert button.
2014-12-16 21:17:54 -05:00
Zuhayr d2803ec4d7 Merge resolution. 2014-12-13 23:10:46 +10:30
Zuhayr 72ea7d9063 Removed the Goon catwalks. 2014-12-11 14:03:59 +10:30
GinjaNinja32 dbf6a2d0ac Make walls and r-walls use the same proc for hulksmash, allow push towards walls 2014-12-10 22:16:55 +00:00
GinjaNinja32 3968f8b492 All turfs except /turf/simulated/wall can now be clicked to push pulled objects towards them 2014-12-10 22:08:44 +00:00
Atlantiscze 3eb6d9f286 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into pewPEWPEWboom 2014-12-09 20:59:28 +01:00
Zuhayr 3c66bd3920 Merge resolution. 2014-12-08 13:01:04 +10:30
mwerezak 3002de4b50 Fixes atoms with no flags being walkable
Fixes atoms that have no flags set allowing movement into them
regardless of CanPass().
2014-12-07 00:59:07 -05:00
Atlantiscze eec262a5e1 Emitters can now damage and eventually break walls 2014-11-29 22:49:06 +01:00
GinjaNinja32 a9111cc8e1 Fixes and guards against strange values 2014-11-25 20:01:30 +00:00