Commit Graph

121 Commits

Author SHA1 Message Date
ShizCalev
5c8751a4c7 Converts some floor tool interactions to tool_acts 2018-02-13 17:09:50 -05:00
vuonojenmustaturska
6406896df1 Replaces a bunch of obj vars (and emagged on machinery/items) with obj_flags (#34078)
* It works, but is it worth it?

* bitfield helpers take 1

* Would this work?

* remove dangling debug code

* rebase & fixes

* vv bitfield stuff, reading

* DNM oceans of shitcode DNM

* honk

* honk2

* plonk

* rebase & fix
2018-01-22 20:19:46 +01:00
ShizCalev
81afde8700 Fixes irreparable plating (#34472) 2018-01-18 21:12:46 -05:00
vuonojenmustaturska
5233ec1f6a Finishes the forceMove port (#33519)
* a thing

* thingy 2: electric boogaloo

* Obligatory webeditor commit
2017-12-15 10:39:34 +13:00
ShizCalev
8eafaccc88 Cleans up unused code 2017-11-20 00:03:33 -05:00
FrozenGuy5
5294c48be1 Adds alot more initialize() part two 2017-11-12 10:56:33 +00:00
FrozenGuy5
de0d93467e Adds alot of initialize() in lots of files 2017-11-11 20:58:15 +00:00
Tad Hardesty
292f6f5f0b Add off switch to holodeck (#32327)
"Holodeck - Offline" is now a selectable program and correctly reverts
the holodeck and uses no power.
2017-11-02 22:28:27 -06:00
as334
43edaedc29 Assmos part 1, #2 (#30791)
* First part of Assmos

* Adds tritium synthesis and basic in-body effects.

* Begins adding the higher tier gases. Removes Freon(not completely yet) adds new gases to scrubers. Fixes some dumb bugs.

* Whoops

* Adds effects and synthesis reactions for pluoxium and stimulum

* Kills Freon.

* Adds sprites

* Removes the magic numbers

* Hyper-Nobelium formation

* Removes Freon from maps.

* Initial Dunc Review changes

* Should ACTUALLY fix the maps this time.

* Dunc Final Review

* Debugging part 1

* Fixes brown gas synthesis

* Auto stash before merge of "assmos-pathconflicts" and "origin/master"

* fix compile errors

* Moves defines. Fixes stimulum coefficents.

* Reworks how Stim and brown gas work, adds tritium to tile fires, fixes a lot of general reaction bugs.

* fixes typo

* Hopefully fixes UI

* compiles tgui

* Tritium balance.
2017-10-26 22:11:56 -06:00
bgobandit
807bbbbd45 Fixes various spelling and grammar errors. (#31764)
* Fixes various spelling and grammar errors.

* check

* CEASE

* i cant stop
2017-10-16 15:06:10 -04:00
ShizCalev
045d4dca2d Fixes being able to sell camera mobs to CentCom (#31306)
* Fixes being able to sell camera mobs to CENTCOM

* Did it Ninja's way.
2017-10-08 13:12:53 +13:00
Jordan Brown
b6d349e1d4 Remove drop_item, drop_item_v, put_in_hands_or_del (#31386) 2017-10-07 13:36:33 -04:00
Tad Hardesty
5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
Firecage
ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage
2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
KorPhaeron
72389743db ismachinery define 2017-10-03 18:13:21 -05:00
AnturK
d90363f19a Fixes more CanPass misuse (#30493)
* Fixes more CanPass misuse

* Let's not give wrong impression

* spans
2017-09-09 19:40:23 -05:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Ian Turk
1b7ca8c0e5 Resolved merge conflicts 2017-08-16 08:33:24 -06:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Ian Turk
371f1ba4f0 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-15 16:01:35 -06:00
FrozenGuy5
cb22264e13 Initialize() Hint 2017-08-04 20:34:27 +01: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
shizcalev
8ebf6b6a43 cleaned up paper 2017-07-26 05:35:05 -04: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
ShizCalev
db10f35703 Cleaned up some emag_acts (#29238)
* cleaned up some emag_acts

* Randomized spark sounds

* Made sparky looking things sound sparky too

* early return
2017-07-15 11:27:50 -04:00
AnturK
d3bcb4cbf9 Removes old height parameter from CanPass proc (#29218) 2017-07-13 08:57:25 -03:00
kevinz000
7a26305498 Replaces ex_act and emp_act numbers with defines (#29215)
* defines

* defines

* explode_none
2017-07-13 08:56:26 -03:00
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Lzimann
b645910673 Fixes holodeck not having the correct area 2017-07-05 09:07:03 -03:00
Lzimann
fdce8da565 Changes the holodeck to use tgui, plus some code refactor/improvements 2017-06-30 21:27:55 -03: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
GunHog
980089dad6 Holodeck Silicon Check
It was possible to emag the holodeck as a non-silicion without an emag.
2017-06-29 13:05:13 -05:00
nicbn
77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Jordan Brown
1c8badd8fe Merge pull request #28590 from optimumtact/korthemoorstrikesthebooritsquiteashorethatbringsustothefore
Refactors hitreaction to pass in the hitting atom
2017-06-20 09:21:14 -04:00
oranges
186d17b77b Refactors hitreaction to pass in the hitting atom
Required some upstream changes to the check_shields proc to also
reliably pass in the atom
2017-06-20 02:48:17 +00: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
Lan
98ed543423 Adds Penguins, and Penguins to Winter Wonderland (#28454) 2017-06-17 09:32:28 -03:00
Cyberboss
5ace376e4a Initialize Refactor (#25981)
Shouldn't break anything, stops warning spam, logs errors qdel style at the end of the game.

Initialize now expects a hint to be returned, one of:
INITIALIZE_HINT_NORMAL - Does nothing, returned by the root proc
INITIALIZE_HINT_LATELOAD - Call atom/proc/LateInitialize
INITIALIZE_HINT_QDEL - Calls qdel on the atom

LateInitialize currently defaults to the old re-calling behavior so there should be no issues with that.
Things that didn't return a hint or fucked up somehow will be logged less loudly than they were before

No more world start warnings!
2017-04-27 09:02:29 +12:00
AnturK
8593ad5324 Fixes duplicate copying tag (#26109) 2017-04-12 18:53:41 -06:00
AnturK
c0989d3784 Fixes holodeck drainback 2017-04-10 08:34:15 +02:00
AnturK
794d3e9346 Fixes holodeck areas 2017-04-08 21:53:47 +02:00
coiax
f9865e39c1 Fixes grammar on objects landing and bouncing off rims (#25722)
Similar messages for basket ball hoops, and things landing in disposal
bins. Huh.
2017-04-01 11:15:13 -04:00
Lzimann
5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Cheridan
7026d45b9e Merge pull request #24780 from ChangelingRain/basaltfix
Fixes basalt lighting
2017-03-08 02:25:38 -06:00
Joan Lung
6f732b42ad no message 2017-03-06 21:56:27 -05:00
Jack Edge
5aaa11e825 Demotes HOLOGRAM to secondary flag
No difference mechanically, but frees up a bitflag slot. Reminder that
if there are no secondary flags on an object, the check is the same as
checking a var is null.

There are only a handful of hologram items in place at any time, they
don't need a full slot in flags.
2017-03-05 21:52:20 +00:00
PJB3005
a63608d023 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-03 16:31:00 +01:00
Lzimann
d76630b0a3 Fixes adjacent check for admin ghosts in the holodeck console 2017-02-26 18:03:04 -03:00
Pieter-Jan Briers
b5b93e51f7 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-18 16:52:07 +01:00