shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,746 Commits 5 Branches 0 Tags
238fca4e59f2d307ce07b37d1c35df42e7ff5a02
Commit Graph
417 Commits
Author SHA1 Message Date
deathride58andGitHub cff10c62d0 Update cloning.dm 2018-06-05 17:24:15 -04:00
81Dentonandletterjay 2fb5bb10b5 Arcade reward: snack rigs (#38268) 
* chew you havisfaction a singlelicious satisfact to snack that up?

* random snack spawn and sponsor name

* static list/initialize
 2018-06-05 13:27:39 -05:00
LetterJayandGitHub b94207ed11 Merge pull request #6994 from Citadel-Station-13/upstream-merge-38223 
[MIRROR] Slight changes to camera network code
 2018-06-05 12:11:19 -05:00
vuonojenmustaturskaandletterjay 83cf30c92e oh ho (#38249) 2018-06-03 11:45:43 -05:00
Jalleoandletterjay d3f34517dc Slight changes to camera network code 2018-06-03 09:04:24 -05:00
Tad Hardestyandletterjay 5173ac3211 Fix autoprocessing cloners 2018-06-03 09:02:20 -05:00
LetterJayandGitHub 5646dd794b Merge pull request #6973 from Citadel-Station-13/upstream-merge-38180 
[MIRROR] Fix family heirloom being lost on cloning
 2018-06-02 07:29:17 -05:00
Jordan Brownandletterjay 5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
Jordan Brownandletterjay f2124aa3cf Merge pull request #38180 from AutomaticFrenzy/patch/heirloom-clone 
Fix family heirloom being lost on cloning
 2018-06-01 09:51:08 -05:00
Cruixandletterjay 9c4f4ce17f AI Multicamera mode (#37695) 
* Added multicamera mode for AIs

* Minor multicamera fixes

* Cameras near an AI multicamera eye now light up red

* Disabled AI multicamera mode without admin intervention

* Fixed AIs being able to use multicamera mode when they should not
 2018-05-31 22:41:48 -05:00
ShizCalevandletterjay 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58andkevinz000 2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
Jordan Brownandletterjay d9b07c1f5d Merge pull request #38045 from ShizCalev/id-teleport-fix 
Security console fixes
 2018-05-25 11:01:10 -05:00
ShizCalevandletterjay bb2f79ed7b Fixes gulag teleporter runtime (#37962) 2018-05-23 01:41:24 -05:00
LetterJayandGitHub 32cf8e6eb2 Merge pull request #6812 from Citadel-Station-13/upstream-merge-37928 
[MIRROR] Comms consoles don't update while viewing messages
 2018-05-21 08:30:19 -05:00
Nichandletterjay 177139a1d3 Replace nauseous with nauseated (#37927) 2018-05-21 03:06:39 -05:00
Jordan Brownandletterjay 2fb886065b Merge pull request #37928 from nichlas0010/fixescommsconsoleupdates 
Comms consoles don't update while viewing messages
 2018-05-20 19:38:01 -05:00
LetterJayandGitHub 0877bdd4e5 Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646 
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
 2018-05-15 00:47:59 -05:00
XDTMandletterjay 5847268db3 Linked teleporters now teleport to the hub instead of the power station (#37684) 2018-05-13 06:13:27 -05:00
deathride58andGitHub aabd098e2e Merge pull request #6695 from Citadel-Station-13/upstream-merge-37709 
[MIRROR] Adds emag_act feedback msg to battle arcade machine
 2018-05-11 03:40:41 +00:00
Dentonandletterjay c34cf3d67f Hit it! They call me Cuban Pete I'm the king of the Rumba beat When I play the maracas I go Chic-chic-ky-boom Chic-chic-ky-boom Yes sir, I'm Cuban Pete I'm the craze of my native street When I start to dance everything goes Chic-chic-ky-boom Chic-chic-ky-boom The senioritas they sing And they swing with "terampero" It's very nice! So full of spice! And when they dance in they bring A happy ring that "era keros" Are singing a song All the day long So if you like the beat Take a lesson from Cuban Pete And I'll teach you to Chic-chic-ky-boom Chic-chic-ky-boom Chic-chic-ky-boom He's a really modest guy Although he's the hottest guy In Havana, in Havana Si, senorita I know That you would like a Chic-ky-boom-chick It's very nice - so full of spice I'll place my hand on your hip And if you will just give me your hand Then we shall try Just you and I "Iy-yi-yi!" "Shake your booty, daddy, wow! See ya'!" 2018-05-09 16:19:33 -05:00
Dax Dupontandletterjay b29f399157 Fixes singuloth not disappeared after a set amount of time. 2018-05-09 13:42:44 -05:00
orangesandCitadelStationBot e0412f6325 Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code 2018-05-06 16:37:13 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
81DentonandCitadelStationBot b368ab377b fixes obj descs and adds new ones (#37483) 2018-04-27 13:21:08 -05:00
Poojawa cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
LetterJayandGitHub e97db8a33c Merge pull request #6481 from Citadel-Station-13/upstream-merge-37339 
[MIRROR] Fixes a lack of feedback when entering too many points for the gulag.
 2018-04-22 22:23:07 -05:00
Dax DupontandCitadelStationBot af48fe9dcf Fixes a lack of feedback when entering too many points for the gulag. (#37339) 2018-04-22 19:42:47 -05:00
Jordan BrownandCitadelStationBot 70a0db6173 Merge pull request #37310 from Jalleo/apc_control_changes 
Fixes and optimises apc_control.dm a tad.
 2018-04-22 09:31:10 -05:00
kevinz000andCitadelStationBot 9da197469b Fixes interaction AI stuff 2018-04-11 14:10:50 -05:00
Poojawaanddeathride58 5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
deathride58andGitHub bae5e5c81d Merge pull request #6291 from Citadel-Station-13/upstream-merge-36997 
[MIRROR] Fixes dead chat announcements not using real name.
 2018-04-07 00:49:33 +00:00
TlaltecuhtliandCitadelStationBot 4f7d35ec4f fixes #34388 by adding cam (#36627) 
* wip fixes #34388

🆑 
fix:stuff
🆑

* vv

* ASDASD

* daikshu

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* 99999999999999999999999999999

* *tabs*

* Update comp_board_designs.dm
 2018-04-06 09:24:47 -05:00
Jordan BrownandCitadelStationBot 554ed22603 Merge pull request #36997 from DaxDupont/is-this-real-life 
Fixes dead chat announcements not using real name.
 2018-04-06 09:08:48 -05:00
LetterJayandGitHub 9045de2c90 Merge pull request #6204 from Citadel-Station-13/upstream-merge-36873 
[MIRROR] Comms console fix - no more refreshing every 2 seconds while trying to purchase a shuttle.
 2018-04-02 05:41:19 -05:00
LetterJayandGitHub 31bb211cb3 Update communications.dm 2018-04-01 19:48:15 -05:00
orangesandCitadelStationBot 6e57afd034 Comms console fix - no more refreshing every 2 seconds while trying to purchase a shuttle. 2018-03-31 18:27:17 -05:00
RobustinandCitadelStationBot 72348f6235 wow 2018-03-31 06:14:31 -05:00
deathride58andGitHub e6c16ba8f8 Merge pull request #6129 from Citadel-Station-13/upstream-merge-36597 
[MIRROR] Security records consoles now uploads the center 32x32 of a photo when putting photos in
 2018-03-27 17:51:17 +00:00
kevinz000andCitadelStationBot 40776d5ee5 Security records consoles now uploads the center 32x32 of a photo when putting photos in (#36597) 
* Sec console centering photos

* Update security.dm

* whoever coded this before me is triple meme
 2018-03-26 21:04:48 -05:00
PoojawaandGitHub 34718e35cd Update medical.dm 2018-03-26 04:32:36 -05:00
orangesandCitadelStationBot 3a93b7e75a Fixes consoles 2018-03-26 02:30:18 -05:00
CitadelStationBotandPoojawa 9f182d89ed [MIRROR] Distinguishes law types by colour (#6022) 
* Distinguishes law types by colour

* merge conflict
 2018-03-19 22:17:24 -05:00
CitadelStationBotandPoojawa dad2d44ea2 [MIRROR] [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#5992) 
* [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#36344)

cl Floyd / Qustinnus
del: Removes short-term effects of mood
add; Adds long-term effects of mood by implementing sanity which goes up with good mood, down with bad mood, but takes time to change. Your sanity can be seen as your average mood in the recent past. All effects of moods are now covered by this system
add: Beauty component, currently only attached to cleanables, but you could attach it to any atom/movable and make them pretty/ugly, affecting mood of anyone in the room.
refactor: Removes the original way of adding mood events, uses signals properly instead.
fix: Cleanables "giving" area's free beauty during initialization
fix: Fixes some events not clearing properly
/cl

Fixes #36444

From now on mood no longer affects you directly, instead it decides whether your sanity goes up or down, when your sanity gets too low you will get the effects of what mood did before.

This means getting hit with bad moods due to being attacked while not mean you are doomed anymore, and you get a large timeframe to get away and just fix your mood later.

I also added the beauty component, you could add this to any object and it would either make a room prettier or uglier, comparable to DF or Rimworld. You could add traits to make certain people ugly, for example.

* [READY] Several fixes/changes to mood, longterm mood effects, beauty component
 2018-03-19 21:33:18 -05:00
PoojawaandGitHub 6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05:00
deathride58 936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
deathride58andGitHub aa0dbb5603 Merge pull request #5850 from Citadel-Station-13/upstream-merge-36070 
[MIRROR] Beacons are no longer radios
 2018-03-09 18:41:05 +00:00
QustinnusandCitadelStationBot a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
Dax DupontandCitadelStationBot 72e3ffa562 Beacons are no longer radios (#36070) 
* Refactors beacons

* Updates maps

* Done

* aaddddasddsafsdf
 2018-03-07 14:43:25 -06:00
Poojawa 95cb6b23f2 controllers, datums, game 2018-03-06 21:16:46 -06:00