Commit Graph

10110 Commits

Author SHA1 Message Date
shizcalev
62b32d3f7a reverted organ refactor #28913
reverts #28913
2017-07-11 22:08:57 -04:00
Jordan Brown
78a2e5c4c3 Adds the hivebot invasion event (#28514)
Follow up to #23398

Xhuis & Cyberboss
add: New hivebot invasion event
2017-07-12 13:09:06 +12:00
ShizCalev
c79aeb9cc0 Var cleanup (#29168) 2017-07-11 16:32:32 -03:00
Jordan Brown
9e24281c36 Merge pull request #29167 from ShizCalev/box-vent-mapping
[Box] Removes stray fan in engineering
2017-07-11 13:00:26 -04:00
Xhuis
0afa80d23a Welding tool icons now use overlays 2017-07-11 12:56:39 -04:00
kevinz000
aa04c8c76c Update musician.dm 2017-07-11 06:28:22 -07:00
kevinz000
6539fa2cb5 Refactors flightsuit code to hopefully be less dumb (#28033)
Refactors flightsuit code to be less crappy
2017-07-11 11:23:02 +12:00
Jordan Brown
d135dc2643 Merge pull request #29162 from ChangelingRain/directionliststweak
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs
2017-07-10 18:45:52 -04:00
Tacolizard
127003957b Organ Update: Refactors chemical and nutrient metabolization onto two new organs, the liver and the stomach. (#28913)
* initial

* add paranthesis

* add zones

* update DNA

* indent

* descriptions

* start refactor

* update dme

* paranthesis

* remove old proc

* refactor digestion onto stomach

* add handle_liver()

* fix

* add stabiliver

* add a warning for liver failure

* lower frequency of warning message

* switch to prob

* fix permissions

* forgot something

* change recipe

* implement liver damage

* change operator

* fix

* fix

* oh the irony

* rebalance

* refactor alcohol tolerance and add med scanning

* fix

* misc fixes, changes and refactors

* fix?

* remove src

* misc changes

* more bugfix attempts

* Update liver.dm

* Update stomach.dm

* FIXED!!!!

* preparation for rnd organs

* rename var

* string changes

* implement tox filtration

* fix

* fix

* fix

* toxin filtration v2

* misc fix

* fix

* fix

* should not be coding this late at night

* reee

* misc

* fix runtimes

* digest me

* typepeath

* add mutant support

* comment and spacing

* commentz

* typepath

* fixes

* fix?

* fix

* change

* plasmeme organs!

* Update liver.dm

* Update stomach.dm

* stabiliver => corazone

* cyberboss review

* cyberboss more like cyberBOOB

* okay cyberBOOB

* cyberBOOOOOb

* static list

* fix?

* fix

* ID please

* hows that for resolving name collision?

* Fix shit
2017-07-10 17:21:27 -04:00
shizcalev
c88d9fb9c9 removed anchored emcloset desc 2017-07-10 11:46:27 -04:00
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
shizcalev
efef14d1bb Updated closet name 2017-07-10 01:48:00 -04:00
shizcalev
30e0d4b270 [Box] Removes stray fan in engineering
fixes #28862
2017-07-10 01:22:40 -04:00
Jordan Brown
afc5640fd6 Merge pull request #29145 from kevinz000/patch-244
Updates vending refill packs to reflect additional items added in headphones PR
2017-07-09 20:45:08 -04:00
Jordan Brown
d4e5cfd5a3 Merge pull request #29140 from ChangelingRain/integrity
Removes now-unnecessary obj_integrity definitions
2017-07-09 20:43:44 -04:00
Tacolizard
46620139ac cattle rustler 2017-07-09 15:10:14 -07:00
Joan Lung
ec9439b915 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs 2017-07-09 17:24:28 -04:00
Jordan Brown
1e173f96c6 Fixes wrapping objects (#29125) 2017-07-09 11:13:15 -04:00
kevinz000
248cf95273 Update flashbang.dm (#29136) 2017-07-09 08:43:43 -03:00
Joan Lung
db503ace11 boss 2017-07-08 18:29:59 -04:00
kevinz000
5e80b018eb Update vending_items.dm 2017-07-08 13:57:10 -07:00
Joan Lung
1feb0021a1 Removes now-unnecessary obj_integrity definitions 2017-07-08 14:02:50 -04:00
MoreRobustThanYou
b96bc440db Fixes plasma glass merging with normal glass (#29114)
* Fixes plasma glass merging with normal glass

* Update window.dm

* Update smelting_designs.dm
2017-07-08 10:44:32 -04:00
Jordan Brown
e89408c15e Merge pull request #29112 from MoreRobustThanYou/patch-4
Reinforced Plasma Glass is more SME-worthy
2017-07-08 10:43:57 -04:00
Joan Lung
bbdfed3c2a Dreams while sleeping are now slightly longer on average and will contain more possibilities (#29104)
* Dreams while sleeping are now slightly longer on average and will contain more possibilities

* I don't think this is worth it at all but sure whatever

* are you dreaming too

* dream
2017-07-07 22:17:57 -04:00
MoreRobustThanYou
6c31809bf0 Update window.dm 2017-07-07 15:11:53 -04:00
MoreRobustThanYou
cdde74d82b Update window.dm 2017-07-07 14:16:03 -04:00
Jordan Brown
6c8b13dd67 Merge pull request #29095 from ChangelingRain/windowfix
Windows now have the proper starting health
2017-07-07 10:02:47 -04:00
MoreRobustThanYou
f97f0afa7f Update window.dm 2017-07-07 09:18:54 -04:00
MoreRobustThanYou
289567a2f1 Update window.dm 2017-07-07 08:30:04 -04:00
MoreRobustThanYou
70f1f9a40d Update window.dm 2017-07-07 08:22:33 -04:00
MoreRobustThanYou
30c00659a9 Update window.dm 2017-07-07 07:56:23 -04:00
MoreRobustThanYou
c172578fda Ups the intergrity of reinforced plasma windows
They need to be SME-worthy
2017-07-07 07:48:55 -04:00
Leo
a43ba99207 Merge pull request #29061 from ChangelingRain/warpeffect
Warp cubes are slightly less instant but way cooler
2017-07-06 22:12:21 -03:00
Tacolizard
5868aedcab initial (#29075) 2017-07-06 22:10:01 -03:00
Joan Lung
ddeab5f6e3 Windows now have the proper starting health 2017-07-06 17:44:50 -04:00
Shadowlight213
68102aaa0c Refactors speech/communication logging and adds coordinates to speech logs (#28997)
* Adds locations to speech and related communications
Refactors how logging is handled for these.

* changes

* ahhhhh

* preemptive merge conflict undoing maybe?

* Let's not delay this further
2017-07-06 16:06:43 -04:00
Jordan Brown
ce590cd648 Fixes windows not returning an Initialize hint (#29038) 2017-07-06 13:03:23 -03:00
Joan Lung
bea7bf9297 Adds Necropolis curses for cursed items in Necropolis ruins (#28992)
* Adds Necropolis curses for cursed items in Necropolis ruins

* Adds sounds credit @FuryMcFlurry

* stat tweak

* these are painful enough

* a bit stronger

* i kind of wish there was a version of get_ranged_target_turf() that worked off of angle.... but there isn't

* smart coder 2000

* bossed around
2017-07-06 11:14:26 -04:00
Jordan Brown
691ba8d67f Removes the need for specifying obj_integrity (#29030) 2017-07-06 11:23:38 -03:00
ShizCalev
c950cb88d4 Replaces highpressure windows with plasma windows (#29051)
* replaces windows

* replaces all instances of highpressure windows

* spacing cleanup
2017-07-06 10:11:44 -04:00
Jordan Brown
94b2134db1 Merge pull request #29050 from ShizCalev/plasma-window-fix
Fixes plasma window sprite
2017-07-06 10:10:54 -04:00
pigeons
ba5372207f Fixes cartridges not linking with their host PDAs on creation (#28989)
* Reverts Initialize memes

* loc

* KISS
2017-07-06 10:06:14 -04:00
Jordan Brown
a2d25af44b Merge pull request #29006 from Xhuis/twohand_storage_fix
Fixes forced two-handed weapons being unstorable
2017-07-05 20:52:03 -04:00
Shadowlight213
91c92c788c Gives ghost roles their own assigned_roles (#29044)
* Gives ghost roles their own assigned_role in mind.

* vars

* skeleton
2017-07-05 20:45:48 -04:00
Joan Lung
f6c1d03805 Warp cubes are slightly less instant but way cooler 2017-07-05 18:02:05 -04:00
kevinz000
62ad647495 Fixes portals not autosetting their overridden target turf on Initialize - "It actually was my fault" (#28999)
* Update portals.dm

* Update portals.dm
2017-07-05 10:36:02 -04:00
shizcalev
059d6375ee why were r-plasma windows named that 2017-07-05 01:17:11 -04:00
shizcalev
08808ff7b7 fixes plasma window sprite 2017-07-05 00:52:06 -04:00
Steelpoint
c3b00bce43 [Ancient Station] First Round Of Changes/Additions (#28843)
* InitialCommit

* BannersAndFixes

* NewChanges

* FinalChanges

* InitializeFix

* Typo

* MinorFixes

* MoreFixes
2017-07-05 00:22:16 -04:00