BongaTheProto
2d1d665e41
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit c1c9fef2246767f48e82
2023-12-16 10:48:35 -05:00
BongaTheProto
c1c9fef224
Merge remote-tracking branch 'upstream/master'
2023-12-15 18:12:47 -05:00
SandPoot
8cdb82a23f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-12 22:06:13 -03:00
SandPoot
e457f40328
maptext
2023-12-11 17:43:24 -03:00
Tsurupeta
d4ec25e748
all else
2023-08-08 14:01:18 +03:00
Darius
f2cf15c590
Refactor Dumb For Cum quirk
...
This commit makes the following changes
- Adds comments
- Adds trait TRAIT_DUMB_CUM
- Adds mood quirk flag
- Adds quirk removal code
- Removes non-modular edits
- Renames trait TRAIT_DUMB4CUM to TRAIT_DUMB_CUM_CRAVE
- Removes interaction blocks
- Removes useless return functions
- Updates flavor text
- Updates variable names
- Changes reagent process to check for trait before triggering uncrave
- Changes on_spawn event to add event
2023-02-02 17:21:54 -05:00
BongaTheProto
86a005b590
Merge remote-tracking branch 'upstream/master'
2023-01-11 12:51:40 -05:00
SandPoot
03304ba2c8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-10 22:50:16 -03:00
SandPoot
cf51a4dce9
dusting off
2023-01-10 18:32:49 -03:00
BongaTheProto
d6aa3acbd4
Merge remote-tracking branch 'upstream/master'
2023-01-09 17:08:06 -05:00
SandPoot and GitHub
2a772c8482
Adds the commando skin from ror & ror2 to the mining hardsuit ( #280 )
...
* first commit with everything
* quick fix and little extra usage!
* the boy
* previous could break
* better head
2023-01-09 18:55:07 -03:00
SandPoot
f2a49bc319
first commit with everything
2023-01-08 21:36:57 -03:00
BongaTheProto
ee6823c69b
Merge remote-tracking branch 'upstream/master'
2022-12-13 12:14:11 -05:00
SandPoot
f4b7513f10
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-13 01:35:33 -03:00
Lin and GitHub
7205781c47
Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
...
Solves some harddels
2022-12-12 19:11:49 -07:00
SandPoot
8911fe5e0b
clear em
2022-12-11 17:58:45 -03:00
Pin-alternative
9ba41fb085
Merge remote-tracking branch 'upstream/master' into cursed
2022-08-15 07:55:25 +10:00
BongaTheProto
9e7c5033cc
Merge remote-tracking branch 'upstream/master'
2022-08-07 21:42:16 -05:00
SandPoot
6108e1d522
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-07 19:46:26 -03:00
Hatterhat
44b23b873d
crusher rename + 350 chr limit descs
2022-08-05 17:41:41 -05:00
Pin-alternative
50245ec870
mlem
2022-07-05 20:38:02 +10:00
WoolyAypa
9c94cad910
modularization and removed the is_dumb4cum proc
2022-06-17 14:03:48 -03:00
WoolyAypa
af3df23c49
dumb4cum that is
2022-06-17 02:46:28 -03:00
SandPoot
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
SandPoot and GitHub
c8df97474b
Adds pick-up, drop and throw sounds for items. ( #240 )
2022-04-01 15:57:30 -03:00
keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
LetterN
fab4b07be5
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-12-21 07:59:33 +08:00
DeltaFire
50be57f107
grrrr
2021-12-08 18:33:06 +01:00
keronshb
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04:00
LetterN
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
LetterN
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
keronshb
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
LetterN
f7b898a2a9
frontend
2021-10-28 17:34:52 +08:00
Letter N and GitHub
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08: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
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
Artur
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
Letter N
4463fd9513
paperwork mini update, also ASS_BLAST_USA
2021-03-06 19:28:29 +08:00
Letter N
5304029dd9
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-23 11:01:42 +08:00
SandPoot
123de14009
upload files
2021-02-18 15:05:39 -03:00
SandPoot
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
Letter N
45d6a5f87f
it compiles, UNTESTED YET
2021-02-13 21:41:59 +08:00
Letter N
5db87b9065
more updates!
2021-02-12 17:52:59 +08:00
Artur
16e0b85b44
More funshit
2021-01-20 18:23:28 +02:00
Artur
3737c52df8
Funny actions
2021-01-20 15:23:34 +02:00
silicons and GitHub
0bb0f89ca2
Update pen.dm
2021-01-03 18:03:36 -07:00
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
BongaTheProto