Commit Graph

1065 Commits

Author SHA1 Message Date
vuonojenmustaturska
6dfa89fab7 Removes on_mob_turn, on_mob_move and intercept_user_move, speeding up movement (#35679)
* honk

* qdel memes
2018-02-16 00:41:04 -06:00
deathride58
05ab5f7c0c Merge pull request #5510 from Citadel-Station-13/upstream-merge-35552
[MIRROR] [s]Fixes writing bugs/exploits
2018-02-16 01:32:23 +00:00
deathride58
a6ac0df5c4 Merge pull request #5504 from Citadel-Station-13/upstream-merge-35651
[MIRROR] Gives eggbox an inhand image, cleans up heartbox inhands
2018-02-16 01:28:54 +00:00
deathride58
3dac047801 Update implanter.dm 2018-02-15 20:09:30 -05:00
ShizCalev
98bbfb8709 [s]Fixes writing bugs/exploits 2018-02-15 16:10:03 -06:00
TehZombehz
326238e59f Gives eggbox an inhand image, cleans up heartbox inhands 2018-02-15 14:23:48 -06:00
KorPhaeron
0ed0abbd4c Slime Radio Potion (#35548)
* Slime Radio Potion

* Deletes inaccurate comment
2018-02-15 10:38:59 -06:00
CitadelStationBot
e0ab141341 [MIRROR] Updates die to use the roll() proc + initialize() (#5480)
* Merge pull request #35564 from praisenarsie/patch-29

Updates die to use the roll() proc + initialize()

* Updates die to use the roll() proc + initialize()
2018-02-14 10:54:58 -06:00
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045
TG Sync #4985279348672983476
2018-02-14 04:11:44 +00:00
TehZombehz
1346e88e6b Fix for invisible heartboxes 2018-02-13 18:08:38 -06:00
oranges
e6ace7bc56 Adds heart-shaped boxes of chocolate to the valentines event 2018-02-13 14:12:32 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
vuonojenmustaturska
a60410b347 Merge pull request #35557 from ShizCalev/pda-virus-fix
Fixes PDA virus runtime
2018-02-12 16:32:07 -06:00
Dax Dupont
a0feb17597 Cell chargers are now buildable and (upgradable!) machines. 2018-02-12 11:15:52 -06:00
deathride58
75249cab07 Merge pull request #5431 from Citadel-Station-13/upstream-merge-35518
[MIRROR] Actually fixes broken accesses
2018-02-11 23:34:13 +00:00
Jordan Brown
ebd82bfe50 Merge pull request #35518 from ShizCalev/ACCESS-FIXES-MK2
Actually fixes broken accesses
2018-02-11 15:48:40 -06:00
AnturK
4615696173 Highlander antag datum (#35519)
* Highlander antag datum

* Forgot debug line

* Also this
2018-02-11 15:33:02 -06:00
CitadelStationBot
51d15518ae Merge pull request #5409 from Citadel-Station-13/upstream-merge-35456
[MIRROR] [s] Fixes altclick exploits
2018-02-11 09:43:09 -06:00
CitadelStationBot
f3569cf023 Merge pull request #5415 from Citadel-Station-13/upstream-merge-35235
[MIRROR] Mining sentience upgrade grants minebots a radio and ID
2018-02-11 07:38:14 -06:00
CitadelStationBot
088ad78f95 Merge pull request #5414 from Citadel-Station-13/upstream-merge-35376
[MIRROR] Buildable Shuttle/Plastitanium Windows
2018-02-11 07:38:06 -06:00
KorPhaeron
e64a42c248 Mining sentience upgrade grants minebots a radio and ID (#35235)
* Minebots get mining radio+ID card

* Updates radio implant paths
2018-02-11 05:13:46 -06:00
uraniummeltdown
e3ec8a648a Buildable Shuttle/Plastitanium Windows (#35376)
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows

* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
2018-02-11 05:13:37 -06:00
Mokiros
cdcb5fc72f Buildable and upgradable All-In-One Grinder (#35451)
Circuit is in "Biological Processing" techweb node
2018-02-11 05:12:23 -06:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
Jordan Brown
fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
vuonojenmustaturska
56369b7f99 Fixes geiger counters on engiborgs (#35423)
* a commit

* Update geiger_counter.dm
2018-02-08 11:21:27 -06:00
oranges
d427e0174b Merge pull request #35346 from DaxDupont/kinky-cuffs
Fixes cyborg related cuffing issues
2018-02-08 03:07:51 -06:00
Jordan Brown
bbf970c213 Merge pull request #35409 from epochayur/master
Belts now have inhand sprites
2018-02-07 23:48:17 -06:00
deathride58
bfce0e4885 Merge pull request #5339 from Citadel-Station-13/upstream-merge-35352
[MIRROR] Toy Daggers!
2018-02-07 20:51:39 +00:00
deathride58
6e469dcf88 Merge pull request #5355 from Citadel-Station-13/upstream-merge-35393
[MIRROR] blueprint area changes are now logged to the game log
2018-02-07 19:11:47 +00:00
deathride58
8e439ec317 Merge pull request #5354 from Citadel-Station-13/upstream-merge-35369
[MIRROR] Adds the saltmine shuttle.
2018-02-07 19:11:31 +00:00
vuonojenmustaturska
13b01b042e Merge pull request #35393 from optimumtact/blueprintlogging
blueprint area changes are now logged to the game log
2018-02-07 07:44:54 -06:00
Dax Dupont
0f8b7da2a1 Adds the saltmine shuttle. (#35369)
* Adds the saltmine shuttle

* Adds an orange, makes the revolver a reverse one

* henk

* honker

* pay me

* more cat and cat accessories

* memes

* Crybabies jeeez

* Salt is expensive

* There now it's an easter egg shuttle

* nani
2018-02-07 07:17:50 -06:00
BordListian
9b910552fd Forces gases to obey certain laws of nature (#35277)
* - Fixes most gas reactions deleting more gas than exists and thus making gas out of nowhere.
- Makes Noblium formation no longer multiplicative.
- Expunges invocation of a byond bug by stimulum production.

* - Redundant parenthesis
- I'm going back to sleep

* - Sends fire and fusion to jail

* - Deletes redundant line in lung code
- Adds garbage_collect and clamp to cryocells
- Adds clamp to collectors

* - Reverted the tritium burn changes because apparently I'm dumb

* - FUCK

* - Fixes division by zero when fusion has no impurities

* - Adds extra commentary for the next unlucky sod
- Compresses lines for performance or so they say
- Adds ..() to rad_act on turfs

* - Fuck it, fixes rad collectors, open turfs, geiger counters and living mobs not signalling rad_act components
2018-02-07 02:32:31 -06:00
ShiggyDiggyDo
991922b323 Toy Daggers! 2018-02-07 02:31:58 -06:00
CitadelStationBot
7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
CitadelStationBot
e16db54c67 [MIRROR] Bartender Drink Sliding: Intrinsic to Extrinsic (#5297)
* Bartender Drink Sliding: Intrinsic to Extrinsic

* Update packs.dm
2018-02-05 04:42:13 -06:00
CitadelStationBot
5c16755e58 [MIRROR] Fixes Vape Pen (e-cig) reagent spam (#5296)
* Fixes Vape Pen (e-cig) reagent spam

* Update cigs_lighters.dm
2018-02-05 04:33:36 -06:00
CitadelStationBot
9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
CitadelStationBot
b16d2148e4 [MIRROR] Steampunk Watches! (#5293)
* Steampunk Watches! (#35187)

* Adds steampunk watches

* Adds steampunk watches to arcade machines

* The steampunk watch can now play a noise!

* Steampunk Watches!
2018-02-05 01:31:16 -06:00
CitadelStationBot
584fc7151b [MIRROR] makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things (#5256)
* makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things (#34888)

* traps patch

* flags!

* makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things
2018-02-05 00:57:31 -06:00
CitadelStationBot
a5d1cae1ac [MIRROR] Fixes smugglers satchels being able to refresh items forever (#5313)
* Fixes smugglers satchels being able to refresh items forever (#35270)

* Fixes smugglers satchels being able to refresh items forever
2018-02-05 00:48:12 -06:00
CitadelStationBot
298b37cacb [MIRROR] Makes slime scanning more readable (#5314)
* Merge pull request #35274 from XDTM/SlimeScan

Makes slime scanning more readable

* Makes slime scanning more readable
2018-02-05 00:46:52 -06:00
CitadelStationBot
330a6ca0af Added transit tubes to the RPD (#5300) 2018-02-05 00:46:34 -06:00
CitadelStationBot
3a7d148417 [MIRROR] Soap now has inhand sprites (#5257)
* Soap now has inhand sprites (#35159)

* Delete items_lefthand.dmi

* Add files via upload

* Delete items_righthand.dmi

* Add files via upload

* Delete custodial_lefthand.dmi

* Delete custodial_righthand.dmi

* Add files via upload

* Delete items_lefthand.dmi

* Delete items_righthand.dmi

* Add files via upload

* Update clown_items.dm

* Soap now has inhand sprites
2018-02-04 22:35:31 -06:00
cebutris
44908503bf Stunswords! (#5179)
* adds in stunswords

* inhands!

* fixes cell charge text.

* adds in the kit and also fuck admin.txt

* Fixes some formatting

* replaces the placeholder icon with

* i hate everything

* tries to fix the dme. hopefully.

* tries again
2018-02-04 22:10:21 -06:00
CitadelStationBot
4d1a5db892 [MIRROR] Corrects Some \ref Macros (#5228)
* Merge pull request #35136 from uraniummeltdown/correcttheref

Corrects Some \ref Macros

* Corrects Some \ref Macros
2018-02-04 22:08:05 -06:00
Poojawa
fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
Poojawa
a24788842b dogborg tweaks, so fuggin DUMB (#5202)
* apparantly you need shuttles, who knew

* some tweaks

Sprites need adjustments
Janidogs need adjustments in UI

* Hm, maybe a fix. Revert attempt to rename sprites

* [MIRROR] Better Chat Squashing (#5193)

* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing

* [MIRROR] Sexy Solar Sprites (#5191)

* replaced solar panel sprites with better ones

* Sexy Solar Sprites

* Automatic changelog generation for PR #5191 [ci skip]

* [MIRROR] New Coffin Sprite (#5190)

* coffins have a new sprite (#34995)

* New Coffin Sprite

* Automatic changelog generation for PR #5190 [ci skip]

* [MIRROR] Makes fire colorful and anime (#5187)

* Makes fire colorful and anime (#34977)

* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.

* Makes fire colorful and anime

* Automatic changelog generation for PR #5187 [ci skip]

* [MIRROR] Expand Cyborg (#5183)

* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg

* Automatic changelog generation for PR #5183 [ci skip]

* [MIRROR] Cosmic Bedsheet (#5170)

* adds cosmic space bedsheet

* Cosmic Bedsheet

* [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174)

* Merge pull request #34964 from MrStonedOne/patch-463

The punisher no longer punishes ticker subsystems with delayed fires

* The punisher no longer punishes ticker subsystems with delayed fires

* Fuck this I'm done with it
2018-01-30 15:17:46 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00