Commit Graph

691 Commits

Author SHA1 Message Date
Joan Lung
e83d72219d Soft crit, except not terrible (#30262)
* Soft crit, except a little bit harder.

* tweak

* 👌

* why was this even in here

* no radios in critical

* fix that too

* keep to original logic

* not very smart, really

* tip: do nothing tgui-side that you can do code-side, because we can't do defines in tgui

* blood trail

* can't do blood trails

* how does this even work

* harsher slowdown and more obscured vision

* it really puts it into perspective; you're fucking dying.

* stat_attack

* stop fuckin whispering into radios or whatever it is you're doing

* more fixes

* fix

* fix

* fix the radio shit

* bikeshed?
2017-09-04 18:58:34 -05:00
pubby
4374ddf30c Bee fixes (#30386) 2017-09-04 16:57:21 -05:00
pubby
41d8b0409f Soil plot fixes (#30378)
* Make soil plots NODECONSTRUCT

* Removes the circuit from soil
2017-09-04 11:27:13 -05:00
Thunder12345
6f90706b49 It's oranges (#30158)
* It's oranges

* sweeps away the memes
2017-08-24 19:29:12 -05:00
Jordan Brown
41eed1ce22 Merge pull request #30079 2017-08-23 12:04:50 -04:00
ExcessiveUseOfCobblestone
9055e892f0 Alternative To Removing Kudzu Manufacturing (#30084)
* Update kudzu.dm

* Update spacevine.dm

* Update spacevine.dm

* b

* Removes Airlock nerf [why did this work anywho]

* Removes Spacewalking kudzu

* Eh, I'll do this myself
2017-08-23 12:03:51 -04:00
shizcalev
ffa5d9e388 Fixes missing inhands 2017-08-21 18:29:51 -04:00
oranges
a9ee524218 Merge pull request #29960 from pubby/weed
Fix spelling of "cannabis"
2017-08-18 13:18:55 +12:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
pubby
10e454a137 Fix cannabis spelling 2017-08-16 08:45:33 -05:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Jordan Brown
d144c88fb5 Annihilates the colons! (#29812) 2017-08-15 12:49:35 -03:00
Jordan Brown
df94d4b189 Merge pull request #29747 from lzimann/machinerycopypasta
Removes a great amount of machinery copypasta with circuitboards.
2017-08-09 15:14:16 -04:00
Lzimann
58d0f12c5c Removes a great amount of machinery copypasta with circuitboards.
Also changes New -> Initialize in most of them.
renamed: `code/game/machinery/computer/computer.dm` -> `code/game/machinery/computer/_computer.dm`
renamed: `code/game/machinery/machinery.dm` -> `code/game/machinery/_machinery.dm`
Moved all circuitboards to a new folder at `code/game/objects/items/weapons/circuitboards`
2017-08-09 11:10:48 -03:00
Jordan Brown
3c56d0f4f3 Ports duplicated slipping code to a component (#29628)
* Ports duplicated slipping code to a component

* Makes metal not slippery

* asdf

* Instead of cherry picking like an idiot I could just copy paster

* OOP

* And blood, don't forget Fry's blood!

* Further fixes

* A more generic fashion

* Use the new system

* Fixes

* Fix cartridge type

* Remove inertia
2017-08-09 16:06:15 +02:00
shizcalev
22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
Jordan Brown
6806607425 Merge pull request #29369 2017-08-02 09:45:05 -04:00
Cyberboss
84b1115d12 Merge pull request #29549 2017-07-29 20:41:05 -04:00
ShizCalev
d525b18d8d Completes major inhand split project (#29574)
* Completes split project

* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
Qustinnus
7ecbb8a1b2 Merge branch 'master' into disgustport 2017-07-29 03:06:25 +02:00
Joan Lung
2b81912dec Fixes scythes cutting kudzu 2017-07-27 20:41:13 -04:00
ShizCalev
0e9b3967e2 Spellchecks the map definitions (#29485) 2017-07-25 14:16:06 +12:00
Qustinnus
cb9b57adcc drinks and stuff 2017-07-19 23:50:05 +02:00
Qustinnus
2312ff09be Fixing conflicts 2017-07-19 11:19:52 +02:00
Qustinnus
58e5aa91da adds the food types 2017-07-19 11:11:13 +02:00
ShizCalev
45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04: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
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04: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
Joan Lung
1feb0021a1 Removes now-unnecessary obj_integrity definitions 2017-07-08 14:02:50 -04:00
Jordan Brown
e9b7e30663 Merge pull request #28942 from Xhuis/uproot_fix
Fixes being unable to dig plants out of soil
2017-07-06 10:14:35 -04:00
Joan Lung
f6ad5996f3 Rethemes the ash walker nest to match the Necropolis (#28886)
* Rethemes the Necropolis

* clen

* not clever enough, hmm...

* that's a bug. hello, bug.

* no message

* a terrifying Legion room. full of one (1) Legion.

* some tweaks, inside has actual floor type

* tweaks

* Rethemes the ash walker nest to match the necropolis

* fix some issues with the door version

* whoops

* run mapmerge tgm, does not tgm

* whoops

* whoops, all dirs

* tgm

* The bonfire has a grill

* nah just do what ergo wanted
2017-07-01 11:39:31 -03:00
Xhuis
c1dad51da6 Fixes soil uprooting 2017-06-29 20:56:13 -04:00
oranges
ae3740d84b use_power var now uses a define to reflect it not being a bool
NO_POWER_USE
IDLE_POWER_USE
ACTIVE_POWER_USE

holopads now correctly set use_power and the active_power_usage
2017-06-29 23:50:16 +00:00
nicbn
77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Ashe Higgs
35a1d0ec3d Grammar and message tweaks (#28642) 2017-06-21 15:14:27 -03:00
bgobandit
078a1e45a6 Lavaland mushrooms and plants can now be cultivated. (#28533) 2017-06-20 20:05:31 -03:00
Joan Lung
99a5230e62 fix that 2017-06-19 15:43:42 -04:00
Joan Lung
38ec5563dc Fixes slips 2017-06-19 14:57:25 -04:00
Jordan Brown
06022a0ba1 Merge pull request #28552 from RandomMarine/lightuplavaland
Bonfires light up in lavaland atmos
2017-06-19 09:53:12 -04:00
Joan Lung
2672d88800 Renames stun effects and changes stun input values as preliminary work for changing stuns to status effects (#28524) 2017-06-18 23:03:51 -03:00
RandomMarine
6e293bb932 bonfires on lavaland? 2017-06-18 06:41:19 -07:00
Joan Lung
f07435337c Merge pull request #28435 from lzimann/typecaches
Changes a lot of is_type_in_list to use a typecache
2017-06-17 12:33:03 -04:00
Lzimann
42aa0dd3aa Changes all the typecaches to the obj definition 2017-06-17 13:24:40 -03:00
QualityVan
a7af10eb56 Adds onions (#28414) 2017-06-16 18:22:31 -03:00
Lzimann
3b7fc1afc2 Changes a lot of is_type_in_list to use a typecache 2017-06-13 15:56:09 -03:00
Cyberboss
d787a39b7a Removes the shadowshroom admin message 2017-05-24 09:47:41 -04:00
Leo
7d91e3143d Changes investigate logs to use a define (#27503) 2017-05-23 15:45:09 +12:00
fludd12
b465361a6d Adds Bonfire Grills (#27250) 2017-05-16 11:27:08 -03:00
oranges
1633062837 Merge pull request #27214 from FantasticFwoosh/Starthistle
Updates starthistle plant description & stats, adds a seed return harvest, fixes sprites & adds starthistle seeds to the botany vendor contraband
2017-05-16 10:03:55 +12:00