Dahlular
978748b8d8
Merge pull request #1066 from lyricalpaws/master
...
We're off to see the wizard
2021-04-17 21:09:27 -06:00
QuoteFox
276a81f026
fluffy half-crop jacket.
2021-04-17 21:21:21 +01:00
Chloe Carver-Brown
f6683fbcd3
we're off to see the wizard
2021-04-15 15:12:13 +01:00
Marvin Megavolt
ac7a714604
Back for round 2
2021-03-31 21:53:46 -05:00
QuoteFox
a4826e6eab
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit f5cf7f6f5aa32444dae7
2021-03-27 10:56:34 +00:00
CapnMachaddish
06a38d57a2
Now available from your local interdimensional dragon shopkeeper
2021-03-23 14:25:11 -05:00
lukevale
cf48916d8d
final touches on the sweater.
2021-03-20 16:28:38 -05:00
DragonTrance
3ebb7488de
Merge branch 'master' into plant-adding
2021-02-21 12:06:48 -07:00
DragonTrance
c729c61765
added tons of botany changes from citadel (not instability)
2021-02-21 09:57:29 -07:00
DragonTrance
24cb27b67c
#5
2021-02-21 08:37:10 -07:00
Vladin
1bfe8bb816
love in the air
...
no not really thats actually nerve gas
2021-02-13 21:51:56 -05:00
QuoteFox
b39881f441
vending fix, wallet fix
...
vending fix, wallet fix
2021-02-04 23:40:40 +00:00
QuoteFox
a40e002595
loose ends.
...
more prices I missed
2021-02-04 14:20:17 +00:00
QuoteFox
2253473cc5
we dont use this anymore
...
we dont use this anymore
2021-02-04 12:47:09 +00:00
QuoteFox
5584bb9522
Economy part 2 - Vendors
2021-02-04 12:42:50 +00:00
CygnusB
00abae18ae
one more time
...
ye
2021-01-19 18:54:17 -03:00
Vladin
a7ee5f4ce0
requiem
...
uniform no longer awkwardly caps and shit added to vendor
2021-01-03 20:10:09 -05:00
Poss
9d7e2c785e
Update cigarette.dm
2020-11-21 22:47:09 -05:00
Oposshim
bb1694f301
Kinaris Corp 1.1.2
...
another long overdue haul of shit I forgot/was to busy to get the first patch around.
2020-11-21 12:05:56 -05:00
Ghom
28cdb9c5f1
Oh no.
2020-10-30 05:30:15 -03:00
Dahlular
ee0017721e
Merge pull request #627 from ArchieBeepBoop/spooky
...
The Spookening: Ports Jacqueline the Pumpqueen event + Dullahan and subsequent Fixes
2020-10-29 22:51:07 -06:00
kevinz000
fa655a1b78
Merge pull request #9456 from Thalpy/Spookytime
...
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2020-10-28 16:04:47 -03:00
kevinz000
071f1cc6af
Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art
...
Code stuffs + more framework for cargo rework cuz atomic prs are good
2020-10-28 04:52:13 -03:00
ToonClyde
4207015199
CitRP Fluffy Jackets
2020-10-26 14:30:59 -07:00
Vladin
5504a9e9da
I was going to be a nurse but I don't like asking permission
...
saved 2 people ran over 40 lets fucking gooooooooo
2020-10-16 15:52:43 -04:00
ToonClyde
19de1094e0
tasty carbon nanotube noodles
2020-10-10 18:07:51 -07:00
SmeagleDeagle
23c7caf6d3
a
2020-09-18 02:40:43 -07:00
Vladin
461b914caf
newlines back
...
whoops didnt want to remove potentially important empty spaces
2020-09-13 02:41:30 -04:00
Vladin
c944d0681b
Galaxy Suits
...
Adds the De Void of Soul and the Pulsar Gonne
Adds both to the loadout for 3 points each
Adds three Pulsar Gonnes to the clothesmate as contraband
Adds three De Void of Souls to the clothesmate as premium items
2020-09-13 02:10:50 -04:00
Unknown
91490e10e2
secbed is now deployed from grenade
...
because pulling a bed out of a vending machine was ridiculous
2020-09-09 13:36:01 -05:00
Unknown
4e272b9cf4
blue yeen's request
...
pink sec winter coat, BDSM whip + riding crop now inflict arousal damage on all intents + have special interaction if you target the groin (ass), slutbelt now can carry flashbangs/grenades + classic batons
2020-09-05 17:13:33 -05:00
Unknown
4330bc4b13
security pet bed
2020-09-05 00:37:45 -05:00
Unknown
79a1167f2d
security pet bed
...
fucking merge conflicts make me want to detonate
2020-09-05 00:20:31 -05:00
Unknown
55230cb73d
Merge remote-tracking branch 'origin/slaveImplant' into slaveImplant
2020-09-05 00:12:08 -05:00
Unknown
a37b290e13
riding crop
2020-09-05 00:08:25 -05:00
Unknown
cc7013f802
the bitch breaker
2020-09-05 00:01:06 -05:00
Unknown
66d3400e9c
the bitch breaker
2020-09-04 23:53:15 -05:00
Unknown
46b6e9e832
holy fuck this is a lot
...
adds: slutcurity belt, slutcurity hailer, security latex gloves, pink security jumpsuit
fixes: stripper armor is now in the sec wardrobe, muzzles now properly stop self-removal
2020-09-04 23:30:11 -05:00
Unknown
1527edfa6b
how could i forget the collars?
2020-09-04 15:07:49 -05:00
Unknown
fe68e382fa
fixes jumpskirt and stripper outfit, adds to secdrobe
...
I knew the fix from the beginning from vg_clothes.dm and it took an entire afternoon of failed fixes to realize FUCK
2020-09-04 14:08:46 -05:00
Poss
9dd397dbd2
Update snack.dm
2020-08-26 18:12:39 -04:00
Poss
06067efe9d
Update snack.dm
2020-08-26 18:12:06 -04:00
Oposshim
4ad543ef57
soyfood
...
i >asked< for this
2020-08-26 16:51:19 -04:00
CygnusB
d173446a9f
Merge remote-tracking branch 'upstream/master'
2020-06-25 01:22:55 -03:00
CygnusB
fff888bf20
lmao wataur
2020-06-25 00:59:13 -03:00
JaySparrow
4c60d0c7f2
Bluespace sewing kit
...
For big bits
2020-06-14 22:24:38 -05:00
Azarak
4c06f50180
Welding hardhats
2020-02-03 21:35:06 +01:00
Azarak
e63c7b37f3
RCD update
2020-01-29 12:45:53 +01:00
quotefox
11b772557b
Merge pull request #142 from SynnGraffkin/Robit-voices
...
Fixes Robodrobe Contraband Items
2019-12-22 07:21:20 +00:00
shellspeed1
87c59c8ec6
clothing
2019-12-21 02:38:06 -08:00
