Commit Graph

80 Commits

Author SHA1 Message Date
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
931682f926 Fixes #7327 2014-12-27 10:01:17 +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
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
GinjaNinja32
c567bd93e9 Add defines, change comment 2014-11-25 19:44:36 +00:00
GinjaNinja32
48343a23fb Fix most nullspace items, rewrite floor tiles not to del() on every place/remove 2014-11-24 17:05:46 +00:00
Zuhayr
ae66fb16d3 Added jetpack, added gear, fleshed out ERT hardsuits. 2014-11-15 17:39:44 +10:30
Zuhayr
31b6cc19ad Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything. 2014-11-13 21:41:02 +10:30
Zuhayr
82090d2de2 Fixed some issues with previous commits, gave aliens and animals an attack proc, removed now-unused stungloves from attack_hand procs. 2014-11-13 21:01:55 +10:30
Zuhayr
4bb4145f5d Readded interactions for slimes and monkeys using attack_generic proc. 2014-11-13 19:18:34 +10:30
Zuhayr
90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
PsiOmega
19b157db10 More Mapping
Fixes #6913.
Splits the arrival section up into sub-areas to reduce the need of crew rescue.
Makes catwalks act as plating instead of floor.
Misc. changes.
2014-11-01 19:20:34 +01:00
PsiOmega
c137e2a3d4 Catwalks too. 2014-10-22 14:01:51 +02:00
Gamerofthegame
a47ec82103 Merge repair 2014-10-03 16:04:31 -04:00
Zuhayr
223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
PsiOmega
56ee7e00b0 Map changes
Makes APCs with different cells specific types.
Replaces arrival's APC with a higher-capacity cell variant to avoid people being unable to leave due to power failure at 12:15.
The engine core now begins without oxygen but still requires cooling and everything else.
2014-09-15 15:30:27 +02:00
Kelenius
b761ff5fcf Fixes floor tiles
Laugh.
2014-09-06 21:34:00 +04:00
Kelenius
505f857eb8 Stack update 2014-09-02 09:59:32 +04:00
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
Mloc-Argent
d5e9851b62 integrate XGM into the code
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-22 19:52:12 +01:00
Loganbacca
e05b5c0bfb Pipe rendering rewrite
- Complete rewrite of pipe rendering code. It now selects icons from a shared cache.
- Manifolds and other devices (pumps, filters, etc.) now match the color of the connected pipes.
- Updated omni devices to use the shared cache.
- Set separate pipe color definitions.
- Cleaned up a lot of pipe code, converting it to absolute paths and removing old commented out code.
- Tweaked t-ray rendering code.
- Tweaked pipe painter.
- Enhanced pipe checking debug command.
- Expanded tank capacity and resprited them.
2014-07-18 13:39:39 +00:00
Mloc-Argent
1aca3fe7f2 atmos: make fires more destructive
Fires can now burn through walls, windows, and (with a high enough
 temperature) rwalls.
New proc: adjacent_fire_act().  Called on turfs that a fire isn't able
 to spread to. (walls, floor surrounded by windows, etc.)

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-06-23 20:58:14 +01:00
Mloc-Argent
6d0098c4fb turf: adds a damage model for walls
New proc for walls: take_damage().
Damage is tracked in the "damage" var, walls will break if "damage"
 hits "damage_cap".
Damage can be repaired with a weldingtool.
Damage overlays are cached in the global wall var "damage_overlays"
 to reduce overhead.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-06-23 20:58:12 +01:00
Mloc-Argent
a33cb7272b Merge remote-tracking branch 'upstream/master' into dev 2014-06-23 20:57:47 +01:00
mwerezak
37e63dfcb0 Fixes FEA temperature_expose() being used...
...instead of ZAS fire_act().
2014-06-22 00:13:22 -04:00
Zuhayr
c2f2a7cde6 Refactored material definitions a little bit, removed all bananium from the codebase. 2014-06-08 00:40:34 +09:30
mwerezak
86b6ffb2c3 Vox skipjack now filled with nitrogen
Added an oxygen canister, breathmasks and tanks for "guests," thought I
don't think they will be needed since people rarely get to the skipjack
without internals of their own.
2014-06-01 13:24:18 -04:00
Mloc-Argent
e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-05-03 16:56:19 +01:00
Mloc-Argent
01e1153c00 turfs: fix some playsound ERRORs on areas
Turf (de)construction playsound()s were using src.loc, instead of src

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-04-27 15:06:42 +01: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
Zuhayr
e870d614c2 Mass correction of controler to controller. 2014-01-25 03:15:13 +10:30
SkyMarshal
8ecfd56540 Some turf cleanup and the like. Trace gases are now properly handled by ZAS on world load.
Fixes #2485
2014-01-08 21:36:03 -07:00
Segrain
ed4389c676 Fix for invisible carpets. 2013-09-19 08:27:34 +03:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path.
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-01 21:53:36 +01:00
Erthilo
8ee601aa9a Fixes thermite runtimes. 2013-08-28 13:27:07 +01:00
Segrain
cd4eaecf21 Fix for #3549. 2013-08-19 13:05:00 +03:00
cib
d7cc42e588 Added wallrot event.
Also some updates to changelog.
2013-05-18 21:55:02 +02:00
Spamcat
4bcb2a1471 NRA Utopia.
Comitting for Rowtree.
2013-04-01 17:43:30 +04:00