Commit Graph

17382 Commits

Author SHA1 Message Date
Arthurdentist
972f383625 Chips again
now with less merge conflicts
2015-03-24 10:24:24 +02:00
9600bauds
96a2f0347f spans 2015-03-24 04:18:31 -03:00
D3athrow
5e6ca19f01 im a dum 2015-03-24 01:52:54 -05:00
9600bauds
f7938870d4 Hydroponics tray distant examination changes/fix 2015-03-24 02:20:56 -03:00
d3athrow
f2ad64336f Merge pull request #3513 from dylanstrategie/Food
Working on food code
2015-03-23 22:15:00 -05:00
D3athrow
26d02eae14 underscores dont work well with this 2015-03-23 21:31:27 -05:00
9600bauds
be73281c99 get it good get it going 2015-03-23 18:39:44 -03:00
D3athrow
3f034b38b5 Snarf 2015-03-23 14:35:32 -05:00
D3athrow
f440f8d7af Vidya 2015-03-23 13:31:51 -05:00
D3athrow
452eee126a french curse will not cause you to drop your pocket items, ID, or belt now. 2015-03-23 13:00:33 -05:00
clusterfack
1793ec1c8e Bugfixes
Removes unused file
Fixes bug with add2stacks under the new proximity flag
Adds an alert before admins become deadminned because HOLY SHIT WHY IS THAT RIGHT NEXT TO CHECK ANTAGONISTS WITH NO CONFIRMATION WHO THOUGHT THAT WOULD BE A GOOD IDEA?
Fixes #2106,Stops giant spiders from webbing themself inside their own capsule in a somewhat snowflakey way, but I've never seen nor heard of this occuring any other way
Fixes a bug where pipeline rebuilds didn't update_values causing improper presure values
2015-03-23 12:45:42 -05:00
dylanstrategie
6a51fbcfba Prop blob damage up 2015-03-23 14:15:30 +01:00
dylanstrategie
fdeee20126 Send maps and fix for sprites 2015-03-23 14:11:54 +01:00
dylanstrategie
569341a3a5 Update window code
That code was old and fucky, goddamn

- Span, formatting, newline, visible_message, yeah
- Remove deprecated commented silicate code. If anyone ever wants to
include something akin to silicate, they would benefit from just
recoding it from scratch. An item that adds health and potentially
changes sprite color can't be that hard to make
- Reduce normal window health by 4 to 10. Why would you use plain
windows
- Remove stupid paths that caused shitty inheritance. window/basic and
window/full/basic were dumb as fucking shit and no longer exist (both
transferred to their respective tree parent, for whatever variables
needed transplanting, so 2-3). All full window types under full/ all
reinforced window types under reinforced/, all in that order
- Add in more examine() information (construction state and health)
- Add in healthcheck() to replace destroy(), hit() and all that logging
and variable juggling bullshit in about every proc where the window can
be damaged
ex_act(), blob_act(), meteorhit() now deplete health only and no longer
magically delete or Destroy() windows. Looks a bit ugly on ex_act 3
since reinforced windows can't be destroyed but grilles always are, and
plasma windows still don't block explosions even if they're now almost
bomb-proof, but that's progress
- Remove window damage on passive grab window "slam", massively increase
mob damage on neck/kill window slam (if you let yourself get grabbed
that far, you deserve to die)
- Change construction from that ugly variable juggling to a fancy and
functional switch() construction code. Include bitflags and
deconstruction safety

- All files that were modified outside of window.dm and fullwindow.dm
are compatibility fixes
Try as I might, I couldn't address #3515. It appears to be fundamentally
fucked due to the way pushing objects (you enter the window's tile) and
pulling objects (you cannot reach the other side of the window, ever)
works. Maybe someone else will manage it

The fixed map will be packed as soon as I can manage it
2015-03-23 14:06:16 +01:00
dylanstrategie
27be630bea Update window code
That code was old and fucky, goddamn

- Span, formatting, newline, visible_message, yeah
- Separate sprites for window panes and full windows. Might need a bit
more refining still, but that's that
- Remove deprecated commented silicate code. If anyone ever wants to
include something akin to silicate, they would benefit from just
recoding it from scratch. An item that adds health and potentially
changes sprite color can't be that hard to make
- Reduce normal window health by 4 to 10. Why would you use plain
windows
- Remove stupid paths that caused shitty inheritance. window/basic and
window/full/basic were dumb as fucking shit and no longer exist (both
transferred to their respective tree parent, for whatever variables
needed transplating, so 2-3). All full window types under full/ all
reinforced window types under reinforced/, all in that order
- Add in more examine() information (construction state and health)
- Add in healthcheck() to replace destroy(), hit() and all that logging
and variable juggling bullshit in about every proc where the window can
be damaged
- ex_act(), blob_act(), meteorhit() now deplete health only and no
longer magically delete or Destroy() windows. Looks a bit ugly on ex_act
3 since reinforced windows can't be destroyed but grilles always are,
and plasma windows still don't block explosions even if they're now
almost bomb-proof, but that's progress
- Remove window damage on passive grab window "slam", massively increase
mob damage on neck/kill window slam (if you let yourself get grabbed
that far, you deserve to die)
- Change construction from that ugly variable juggling to a fancy and
functional switch() construction code. Include bitflags and
deconstruction safety
- All files that were modified outside of window.dm and fullwindow.dm
are compatibility fixes

Try as I might, I couldn't fix #3515. It appears to be fundamentally
fucked due to the way pushing objects (you enter the window's tile) and
pulling objects (you cannot reach the other side of the window, ever)
works. Maybe someone else will manage it
2015-03-23 13:47:48 +01:00
clusterfack
0375db38c1 Merge pull request #3550 from clusterfack/panic
Datum Initialization Hotfix
2015-03-23 05:21:13 -05:00
clusterfack
47ab42f2ba Another datum initialization hotfix. Initial does not create lists causing type mismatches. 2015-03-23 04:49:37 -05:00
9600bauds
232dbe1ce8 Movable seed extractor & seed processor 2015-03-23 05:13:16 -03:00
9600bauds
fc3e2af2e8 Global var nonsense 2015-03-23 04:45:08 -03:00
d3athrow
bbe6998020 Merge pull request #3546 from 9600bauds/abc
Alphabetical sorting for smartfridges
2015-03-23 01:37:22 -05:00
9600bauds
95e34d3fdc Fixes alphabetical sorting for smartfridges 2015-03-23 03:30:25 -03:00
9600bauds
1ed508c467 Credits for PR porting 2015-03-23 03:29:46 -03:00
9600bauds
835c935453 Variable amounts for seed dispenser vending 2015-03-23 03:26:35 -03:00
d3athrow
44cd6ac2b1 Merge pull request #3543 from dylanstrategie/Fireaxe-Cabinet
Fix #3539
2015-03-22 22:59:52 -05:00
clusterfack
40ddfba77c Another runtime fix for datum pooling 2015-03-22 20:54:32 -05:00
clusterfack
156ec31139 Should fix runtime error with datum pooling having 0 arguments. 2015-03-22 20:49:40 -05:00
dylanstrategie
d12febc314 Fix #3539
- Add a 1 second nextAttack delay when slapping shit on a fireaxe
cabinet (either unlocking, breaking, or filling it)
- Unfuck if-else tree, make what is happening at each step a bit more
explicit
- Transfer hit sounds and hit messages to be correct
- Fix some formatting

- Add a new fancy examine proc() to boot, because examining things is
fun
2015-03-23 02:22:50 +01:00
9600bauds
55d4b0a202 Porting over tg's seed extractor 2015-03-22 21:57:12 -03:00
dylanstrategie
f37f906eef Fix #3525
- Add origin_tech to regular beakers (material 1, directly based on
similar value for glass sheets), add origin_tech corresponding to their
research techs to bluespace and statis beakers (both types). Vials
inherit beaker origin_tech
- Unfuck pathing in advanced beaker types, which forced me to modify the
abandoned_crates file (use an actual branch-off for large beakers)
- Actually use variable inheritance instead of repeating the same values
over and over
- Add logging for dousing shit with thermite
- Span, formatting, visible_message, newline, absolute pathing
- Remove commented vial definition duplicate
2015-03-23 01:40:01 +01:00
ririchiyo
78a0252494 Merge pull request #3537 from eswordthecat/remove-time-spaces
remove extra spaces.
2015-03-22 16:35:10 -04:00
eswordthecat
9c9ec79f28 remove extra spaces. 2015-03-23 04:05:38 +08:00
dylanstrategie
05ec69dc21 Lower starting amount of Chef's Special Sauce back to 20
- You can still fit 50 units in the bottle, for Chefs who wish to
customize their death sauce
2015-03-22 20:59:04 +01:00
eswordthecat
01569e253a Fix species special feature not executing at new say code. 2015-03-23 03:25:25 +08:00
ComicIronic
0dfbb0b468 Spell fixes.
Fixes #3531: the need for clothes wasn't being changed in the flags.
Fixes #3463: damage should mean fireball is no longer a dickle tickle.
2015-03-22 18:50:42 +00:00
D3athrow
68131129ef Fix #3524 2015-03-22 13:29:58 -05:00
eswordthecat
601c605b34 Just use the internal icon at image 2015-03-23 02:28:12 +08:00
eswordthecat
6423eb38ed Remove duplicate procs. 2015-03-23 01:49:16 +08:00
eswordthecat
7f50d09746 Merge remote-tracking branch 'upstream/Bleeding-Edge' into parse-zone-switch 2015-03-23 01:10:10 +08:00
eswordthecat
b00c27d7db parse zone switch instead of lengthy if-else chain. 2015-03-23 01:08:10 +08:00
d3athrow
e22c5287e9 Merge pull request #3528 from eswordthecat/remove-ddrange
replace ddrange with clamp proc.
2015-03-22 12:05:05 -05:00
d3athrow
0fb36af0db Merge pull request #3527 from eswordthecat/once-upon-a-time
Make worldtime2text accept timestamp (if null set to default world.time)...
2015-03-22 12:04:58 -05:00
d3athrow
4207fd2f3a Merge pull request #3529 from eswordthecat/clamp-freq
Use clamp on this part.
2015-03-22 12:04:40 -05:00
eswordthecat
2a902afb3f Use clamp on this part. 2015-03-23 00:57:04 +08:00
D3athrow
5c46c56278 Fix #3518 2015-03-22 11:53:05 -05:00
eswordthecat
53d733eca6 replace ddrange with clamp proc. 2015-03-23 00:39:32 +08:00
D3athrow
66b703fe7a tweak the syndi item list 2015-03-22 11:25:35 -05:00
d3athrow
dd984d4974 Merge pull request #3473 from clusterfack/muhcascade
Little thing
2015-03-22 10:40:28 -05:00
d3athrow
67d24e6850 Merge pull request #3526 from eswordthecat/admin-log
Log who verb usage by admins.
2015-03-22 10:36:04 -05:00
eswordthecat
a1526c01ef Make worldtime2text accept timestamp (if null set to default world.time). 2015-03-22 23:27:42 +08:00
eswordthecat
e1b59e4954 Log who verb usage by admins. 2015-03-22 22:49:30 +08:00