Commit Graph

674 Commits

Author SHA1 Message Date
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
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
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
Gamerofthegame
a47ec82103 Merge repair 2014-10-03 16:04:31 -04:00
Zuhayr
3f05362577 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-10-01 18:16:04 +09:30
RavingManiac
918520df83 Mobs will bob up and down in space and zero-gravity unless they are both wearing magboots and within 1 tile of a dense object/turf. 2014-09-30 01:22:13 +08: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
9fcde12b4f Organ rewrite mapclean attempt. 2014-09-29 06:18:58 +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
Zuhayr
29e59ff456 Merge pull request #6289 from comma/overmap
Overmap
2014-09-08 11:21:37 +09:30
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