ce2446922e
[MIRROR] Initialize fixing ( #10335 )
...
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2025-03-08 22:22:04 +01:00
a245b8687f
[MIRROR] usr to user part two ( #10015 )
...
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2025-01-31 22:27:34 +01:00
fd5d9267ff
[MIRROR] Converts gas, ore, plants and reagent strings to defines ( #9611 )
...
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com >
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2024-12-12 02:11:06 +01:00
ab154b48b2
[MIRROR] refactors most spans ( #9139 )
...
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com >
Co-authored-by: Kashargul <KashL@t-online.de >
2024-10-04 15:00:17 +02:00
5ea698a0ef
[MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] ( #9084 )
...
Co-authored-by: Changelogs <action@github.com >
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com >
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com >
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
Co-authored-by: Kashargul <KashL@t-online.de >
2024-09-30 21:36:41 +02:00
3995338290
Moar whitespace normalization [MDB IGNORE] ( #7750 )
...
Co-authored-by: Raeschen <rycoop29@gmail.com >
2024-02-16 10:54:47 +01:00
Razgriz and GitHub
a5037f3180
Revert "[MIRROR] Runtime fixes"
2023-02-12 19:03:56 -07:00
Casey and CHOMPStation2
2891dc3ea7
Merge pull request #14476 from Heroman3003/runtime-17
...
Runtime fixes
2023-02-12 18:21:37 +00:00
Casey and CHOMPStation2
928a321b5f
TGUI Input Conversions
2022-06-19 03:59:14 +00:00
Casey and CHOMPStation2
654d2218f2
Merge pull request #12667 from GhostActual/aurora_bureaucracy
...
Aurora Bureaucracy
2022-04-06 08:26:10 +00:00
Aronai Sieyes and Chompstation Bot
0f2f5cb482
Merge pull request #11615 from VOREStation/upstream-merge-8311
...
[MIRROR] Remove suicide act
2021-10-28 00:49:05 +00:00
Aronai Sieyes and Chompstation Bot
c37ae601b6
Merge pull request #11442 from GhostActual/baggage
...
Fulpstation Briefcases
2021-08-25 00:00:00 +00:00
Chompstation Bot
481c0e314e
Convert some bools to TRUE/FALSE instead of 1/0.
2021-07-16 17:44:40 +00:00
Chompstation Bot
287a5deee3
Use material defines more
2021-07-07 19:02:05 +00:00
Chompstation Bot
b6e1989a01
The One Where I Port Modals
2021-06-30 19:29:34 +00:00
Chompstation Bot
ad57e1ad13
[MIRROR] Sideports a couple of init unit tests from Neb.
2021-02-27 18:45:36 +00:00
Rykka
d2fb9a7691
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
Aronai Sieyes
09074eaabb
Alter playsound paradigm
2020-05-18 23:42:15 -04:00
Aronai Sieyes
8216144ab9
Add cooldown to pen clicks
...
Fixes https://github.com/VOREStation/VOREStation/issues/7000
2020-05-04 23:06:38 -04:00
Unknown
9f9e0b329d
Reverts old vorestation edits
2020-04-05 22:26:34 -04:00
Mechoid and VirgoBot
487c39eab8
Antag Uplink Expansion
2020-03-17 00:23:20 -04:00
Atermonera and VirgoBot
8d2b41ad2c
Big Bastard Incidental Sound Port
2020-03-15 14:39:19 -04:00
Novacat and GitHub
554ddbb7ff
Merge pull request #6625 from VOREStation/aro-beuro
...
New folders/pen/clipboard sprites
2020-03-01 10:51:59 -05:00
Atermonera and VirgoBot
cc487ceebf
Merge pull request #6737 from listerla/penclick
...
Makes pen click when you click on them
2020-02-24 16:20:09 -05:00
Aronai Sieyes
25f31306db
New folders/pen/clipboard sprites
...
From CEV-Eris (or maybe Bay?)
2020-02-20 21:24:01 -05:00
Arokha Sieyes and Leshana
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
Atermonera and GitHub
6adbe5537e
Merge pull request #5079 from BillyBangles/they-arent-sharpies-i-swear
...
Adds permanent markers
2018-03-28 11:49:10 -07:00
Billy Bangles
05fd53ebcc
adds permanent markers
...
also tweaks paint recipe to use ink instead of crayons.
2018-03-19 20:20:31 -04:00
Arokha Sieyes and Leshana
73838e0a62
POLARIS: Revamp logging to be consistent
2018-03-13 18:20:58 -04:00
MarinaGryphon and Anewbe
72318d46b6
Replaces most of the gender macros. ( #4681 )
...
* Fixes #4632 .
* 1:27 am coding best coding
* fixes a warning
* Removes the last of the gender macros. Gender is dead.
* gender II: the travis-ing
* linebreaks are dead too.
* oops i accidentally the gender, also ambiguous gender is now taken into account for get_visible_gender
2018-02-03 14:40:09 -06:00
Anewbe
97169dc5b7
Parapen nerfs
2017-11-06 02:02:14 -06:00
Belsima
87f98d3b24
Replaces status frame sprite.
2017-08-15 23:49:34 -04:00
Cameron653 and Anewbe
97957fcaee
Replaces more macros. ( #3647 )
...
* MORE MACRO CHANGES
AHHHHHHHHHHHHHHHHHHHH
* Fixes a few typos
* Fixes compile error
* Fixes for real
* 4 macros left that I can't find
2017-07-27 21:12:21 -05:00
Belsima
1d7cea9864
renames a mislabelled pen
2017-07-10 18:07:07 -04:00
Belsima
b7a34a3645
Adds a gilded pen.
2017-07-10 18:01:43 -04:00
Neerti
828dacf485
Centralizes weight class definitions
...
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.
Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it. This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files. In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.
The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
Kelenius
3fdda5e8c5
Fixes issues travis found
2016-03-11 11:59:51 +03:00
Zuhayr
e3d9bc90e3
Added more colour defines, added functionality to the floor painter.
2015-08-18 13:41:04 -07:00
Mustafa Kalash
cc56480f99
Adds an Internal Affairs hardsuit; adds a mounted pen, stamp, paper dispenser, and flash; maps in the IA hardsuit; and adds a pen which can cycle through the three colors.
2015-06-11 23:31:25 -04:00
PsiOmega
d0232732d4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/floodlight.dm
code/game/objects/items/devices/suit_cooling.dm
code/modules/organs/subtypes/diona.dm
code/modules/paperwork/pen.dm
code/modules/reagents/reagent_containers/hypospray.dm
html/changelogs/.all_changelog.yml
2015-05-30 16:11:57 +02:00
GinjaNinja32
76daebe0db
More consistent logging via admin_inject_log proc
2015-05-29 16:57:42 +01:00
GinjaNinja32
86f52910a1
Fixes #5945 , de-copy-pastes parapens and sleepypens
...
Harm-syringes, hyposprays, parapens and sleepypens now all respect armour, and produce admin logs for transferred reagents if any are transferred.
2015-05-28 22:23:37 +01:00
Kelenius
35a20002c6
Merge branch 'dev' into ofResearchAndPrototypes
...
Conflicts:
baystation12.dme
code/defines/obj/weapon.dm
code/game/mecha/equipment/tools/medical_tools.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/mecha.dm
code/game/mecha/mecha_parts.dm
code/game/objects/items/devices/flash.dm
code/game/objects/items/devices/powersink.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
code/game/objects/items/weapons/circuitboards/machinery/power.dm
code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
code/game/objects/items/weapons/circuitboards/machinery/research.dm
code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
code/game/objects/items/weapons/flamethrower.dm
code/game/objects/items/weapons/handcuffs.dm
code/game/objects/items/weapons/kitchen.dm
code/game/objects/items/weapons/shields.dm
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/objects/items/weapons/teleportation.dm
code/game/objects/items/weapons/tools.dm
code/modules/assembly/igniter.dm
code/modules/assembly/infrared.dm
code/modules/assembly/mousetrap.dm
code/modules/assembly/proximity.dm
code/modules/assembly/signaler.dm
code/modules/assembly/timer.dm
code/modules/assembly/voice.dm
code/modules/clothing/glasses/glasses.dm
code/modules/hydroponics/trays/tray_tools.dm
code/modules/mining/drilling/scanner.dm
code/modules/mining/mine_items.dm
code/modules/mining/ore.dm
code/modules/mob/living/silicon/robot/analyzer.dm
code/modules/power/rust/circuits_and_design.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/projectiles/guns/energy/laser.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/energy/stun.dm
code/modules/research/circuitprinter.dm
code/modules/research/designs.dm
code/modules/research/destructive_analyzer.dm
code/modules/research/protolathe.dm
code/modules/research/rdconsole.dm
code/modules/research/research.dm
code/modules/research/server.dm
code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
2015-05-20 11:50:28 +03:00
Kelenius
10915eae24
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/game/objects/effects/chem/chemsmoke.dm
code/modules/customitems/item_defines.dm
code/modules/projectiles/guns/launcher/syringe_gun.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
code/modules/reagents/reagent_containers/food/drinks.dm
code/modules/reagents/reagent_containers/pill.dm
maps/exodus-1.dmm
2015-05-15 11:28:05 +03:00
Zuhayr
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
Zuhayr
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
PsiOmega
1c38be5cfd
Crayons are now children of pens.
2015-05-05 08:41:24 +02:00
Zuhayr
dbf8e53020
Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores.
2015-04-26 12:53:26 +09:30
Kelenius
db30c15e4c
Updates to science
...
Protolathe and CI build procs moved to them from RD console.
Protolathe and CI now have a build queue. Designs take varying time to
build.
P and CI material storage is now a list instead of a set of vars.
origin_tech is now a list.
All sheets now contain exactly 2000 units of matter.
In design datum, chemicals and materials are two separate lists.
Designs are now sorted. The method is kinda hacky but flexible. They
have a var, sort_string. Designs are sorted alphabetically using it.
Circuits how show whether they build a machine or a computer in CI menu.
Adds item construction, for now protolathe is used.
2015-04-04 13:38:03 +03:00
Kelenius
24ef7752cd
Merge branch 'Baystation12/dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/carbon/monkey/monkey.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/glass.dm
2015-03-28 19:14:59 +03:00
