Commit Graph

856 Commits

Author SHA1 Message Date
SandPoot
1561138350 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-16 14:11:00 -03:00
keronshb
6b23d177c8 Merge remote-tracking branch 'upstream/master' 2021-10-15 19:25:41 -04:00
keronshb
8cb16aa0f3 Fixes item transfers 2021-10-14 17:26:17 -04:00
keronshb
13140f9bb9 Somewhat fixed huds and stuff, not 100% 2021-10-14 16:36:18 -04:00
keronshb
6331ced3e5 The rest of the offering stuff 2021-10-13 22:13:33 -04:00
SandPoot
f94c76bea6 Adds fleshlights (#187)
* Upload files

* Update files

* Update objects.dm

nobody saw this shameful webedit.
2021-10-12 23:00:03 -03:00
SandPoot
608b6fbb1b Upload files 2021-10-12 22:17:43 -03:00
keronshb
bd7a2b6a2a Lets families compile 2021-10-12 16:12:38 -04:00
keronshb
d88933b492 Families wanted stars now only show up when you are involved in it, and announcements for wanted level changes (#50283)
* Wanted level stuff

* fuck

* Update code/game/gamemodes/gang/gang.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/_onclick/hud/families.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/game/gamemodes/gang/gang.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/modules/antagonists/gang/gang.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/modules/antagonists/ert/ert.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
2021-10-12 14:03:33 -04:00
keronshb
41013ec815 Part 2 - Missing stuff from original families port 2021-10-12 12:07:02 -04:00
keronshb
0bae06adcd Original Port 2021-10-11 22:00:54 -04:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot
e7d5275a70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-20 14:32:29 -03:00
SandPoot
382473eb88 Thicc 2021-09-17 14:15:39 -03:00
SandPoot
f61c505bbf Glued items too 2021-09-16 01:37:05 -03:00
SandPoot
456f68b32b Upload files 2021-09-16 01:05:28 -03:00
SandPoot
2627ae7aa1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-09 23:17:18 -03:00
silicons
c600fae409 Merge pull request #15103 from SandPoot/cyborg-grippers
Does some nice stuff on cyborg grippers
2021-09-09 17:59:47 -07:00
SandPoot
e3c17dc05e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-09 01:57:47 -03:00
silicons
82103d8c15 Merge pull request #15043 from BlueWildrose/dropitlikeitshot
CTRL + (combat mode) Right Click - positional dropping and item rotation
2021-09-08 20:40:41 -07:00
SandPoot
37e2470616 Upload files 2021-09-08 19:53:47 -03:00
SandPoot
e738c3cf21 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-27 12:40:48 -03:00
Cognition
809a8f1fad Drop it into doors 2021-08-27 04:35:40 -07:00
Cognition
abc8ce549b CTRL + Right Click - positional dropping and item rotation 2021-08-27 02:06:52 -07:00
keronshb
7070a848b6 Item Highlight Port 2021-08-22 00:21:06 -04:00
SandPoot
ab9b824ce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-08 14:18:09 -03:00
Artur
4b2bffdff0 Actually makes it work by /obj/screen --> /atom/movable/screen 2021-07-29 14:06:18 +03:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur
3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
SandPoot
b7a1e1e0b2 Upstream merge (#169)
* changes

* changes

* changes

* changes

* changes

* changes

* removes combat mode effects

* changes

* changes

* changes

* changes

* changes

* changes

* changes

* less awful

* baton change

* whew

* okay

* math fix

* framework

* Oh Boy

* fixes

* conflict gone

* whew

* yell wip

* ripping off my own code

* fixes

* almost compiling

* e

* auto

* hacky

* local testing time

* modifications

* sigh

* Yelling works

* attempt examinate

* fix

* yelling

* ok

* it works

* it works.

* woo

* let's make this work

* Update PubbyStation.dmm

* Incinerator mapping tweak

* qm can announce to station

* blue airlocks (maybe will remove that)

* changes to HoP access

he couldn't access cargo already, now it's just polished so they don't have weird cargo access that they can't use

* changes Box HoP console to request only (like in the other maps)

* wtf why is this here

* and WHY is this here too???

* Revert "and WHY is this here too???"

This reverts commit 424a53773296eaf261c97992c618c580449f6031.

* Revert "wtf why is this here"

This reverts commit 59fdca38b55ce97ab5bdf28cbea7fb3b9915474e.

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Update PubbyStation.dmm

* Adds plushies from various sources/custom made.

A patch you didn't know you needed.

* More code. Shouldn't break anything.

We'll see if it does.

* Adds a rolled up newspaper sprite

* Adds a child item to the telebaton

identical stats for the future but different looks.

* And a recipe.

You attach a newspaper to a telebaton with tape.

* all the stuff to add pod to code

* The actual map

* Automatic changelog compile [ci skip]

* A

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

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

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

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

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

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

* Okay, let's try this again.

I don't like you, you don't like me,
can we please just get along?

* e

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

* Automatic changelog compile [ci skip]

Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: bunny232 <bunnyracer23@yahoo.com>
Co-authored-by: qweq12yt <45515587+qweq12yt@users.noreply.github.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: WanderingFox95 <75953558+WanderingFox95@users.noreply.github.com>
Co-authored-by: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Co-authored-by: Lin <linzolle@gmail.com>
Co-authored-by: CitadelStationBot <citadelstationcommunity@gmail.com>
2021-06-30 12:12:52 -03:00
silicons
5c44cc22f4 attempt examinate 2021-06-13 00:54:15 -07:00
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
SandPoot
283e2651eb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-23 16:52:37 -03:00
keronshb
b33269c806 trailing endline 2021-05-19 19:16:24 -04:00
keronshb
a6e157ba73 IT WORKS!! 2021-05-19 19:03:21 -04:00
keronshb
58cb278327 Missing errors and icons 2021-05-19 15:09:56 -04:00
SandPoot
0313149d1c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-08 02:43:01 -03:00
SandPoot
9cf04467a7 upload files 2021-05-05 17:55:30 -03:00
silicons
8fe45263c5 whew 2021-04-26 22:58:30 -07:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
SandPoot
bab386168e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-18 23:23:02 -03:00
silicons
e8e625cb5c Merge pull request #14603 from Putnam3145/fix-base-option
Activity tracking; traitor class tweaks
2021-04-18 18:49:27 -06:00
SandPoot
5002a33209 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-13 22:54:07 -03:00
Putnam
4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
silicons
ef2482c6b0 renders storage objects independently per user (#14545)
* sigh

* sigh

* override

* hah..

* kinda working

* done
2021-04-13 15:16:21 +02:00
SandPoot
6f15641f33 Thirst (#151)
* upload files

* upload files

* upload examine.dm

* Update modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
2021-04-03 19:54:56 -03:00
SandPoot
d13cc725b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-28 16:50:17 -03:00
silicons
2a7aa8e826 Merge pull request #14524 from SandPoot/borgs-buff
Allows borgs to move pulled stuff around like a human
2021-03-28 13:48:14 -06:00
SandPoot
1a7d33b801 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-27 11:41:32 -03:00
SandPoot
0994a37af5 upload files 2021-03-26 11:05:36 -03:00