Commit Graph

30037 Commits

Author SHA1 Message Date
Neerti
8b1c58d2a1 Stupid indentation checker getting confused with comments 2020-03-12 00:54:15 -04:00
Neerti
e8c51b9291 Makes R_EVENT go everywhere. 2020-03-11 23:17:24 -04:00
Neerti
a614b26677 Gives +MOD the traitor panel and colorable OOC. 2020-03-10 20:24:45 -04:00
Atermonera
dcc4d199cc Merge pull request #6803 from Schnayy/CookingUpdate1
Cooking adjustments
2020-03-10 15:40:04 -07:00
Schnayy
1d565808b3 fix and changelog 2020-03-10 13:39:32 -05:00
Atermonera
271f1bf87f Merge pull request #6800 from Cerebulon/spiderstomp
Allows Spiderlings to be Stomped
2020-03-10 00:46:12 -07:00
Atermonera
aee62cf066 Merge pull request #6797 from Cerebulon/mentholfix
Fixed menthol cigarette runtime
2020-03-10 00:40:11 -07:00
Atermonera
e1b7aaff79 Merge pull request #6796 from Cerebulon/newsUpdatemar2020
Oct-Feb News Update
2020-03-10 00:36:51 -07:00
Atermonera
b930c72904 Merge pull request #6795 from VOREStation/pol-gametime
Makes pregame time a config setting
2020-03-10 00:32:46 -07:00
Schnayy
4cdb795be1 fixes an oopsie 2020-03-08 16:38:03 -05:00
Schnayy
e81f95e61f Fixes names appearing in vendors properly. 2020-03-08 16:31:44 -05:00
Atermonera
a4100b5b74 Merge pull request #6793 from Cerebulon/emlocksprite
Fixes shuttle emergency locker sprites
2020-03-08 12:21:16 -08:00
Aronai Sieyes
167f947e95 Boring minor things (#6792)
* Touch up bed/chair/stool icon updating

* Brighter permanent light

* Improve SMES icon handling

* Powernet cable nodes work on shuttles
2020-03-08 12:20:26 -08:00
Cerebulon
cf39f06e68 Allows Spiderlings to be Stomped 2020-03-08 16:55:09 +00:00
Schnayy
4b2a0cc6cf Many small changes. 2020-03-08 10:16:17 -05:00
Cerebulon
7656625987 Fixed menthol cigarette runtime 2020-03-08 15:16:00 +00:00
Cerebulon
da592aace9 Oct-Feb News Update 2020-03-08 14:57:02 +00:00
Mechoid
51fd39f84a Exosuit Expansion: Return of the Ripley (#6767)
* Expands further upon Exosuits.

* FixFix Inflatable Deployer

* Changelog, fix oversights.

* Burst.

* Default 0
2020-03-07 21:51:50 -08:00
Aronai Sieyes
5b236b1a05 Makes pregame time a config setting
Boo hardcoded values
2020-03-08 01:10:04 -04:00
Cerebulon
c6c7124583 Fixes emergency locker sprites 2020-03-07 10:10:00 +00:00
listerla
02f97a116e Adds ecigs and vaping (#6753)
* Adds ecigs and vaping

* Uncomments ssobj

Co-authored-by: lemon <lemon@localhost.localdomain>
2020-03-06 07:09:24 -08:00
Atermonera
a5b0c9126a Merge pull request #6789 from VOREStation/pol-busysignal
Moving AI busy check so it's performed less and more centrally
2020-03-05 12:13:42 -08:00
Atermonera
ac29e95a15 Merge pull request #6787 from VOREStation/pol-latchto
Trains try to talk to nobody on init
2020-03-05 12:12:16 -08:00
Aronai Sieyes
74e71454bd Fix AI busy 2020-03-05 00:04:07 -05:00
Aronai Sieyes
0dd194e047 Salvageable machines (#6768) 2020-03-03 13:44:31 -08:00
Neerti
24fbd0b87e Half-Refactors Jobs (#6762)
* Somewhat cleans up a piece of job code, makes new ID computers not be awful.

* Changes ROLE_ defines to DEPARTMENT_ to be clearer. Backports the new ID computer's assignment section of its UI to the old ID computer.

* Swaps back to southern cross map.

* Removes a block of commented code.
2020-03-03 13:27:37 -08:00
Schnayy
5f33c40356 Let them finally eat cake (#6778)
* whyyyy

* messily keeps poisonberries a berry alternative
2020-03-03 12:56:34 -08:00
Heroman3003
95551e6e54 Fixes sofa not refunding any material (#6784) 2020-03-03 12:53:27 -08:00
Aronai Sieyes
149215995b AI Tweak bugfixes (#6779) 2020-03-03 12:52:52 -08:00
Arokha Sieyes
4bd2b41acb Trains try to talk to nobody on init 2020-03-03 14:54:58 -05:00
Atermonera
a3de24a7e4 Merge pull request #6774 from Schnayy/spritefix-march
Sprite fixes
2020-03-02 22:46:42 -08:00
Atermonera
c2ba48348d Merge pull request #6772 from Heroman3003/teshfix
Fixes a teshari mining undercoat
2020-03-02 22:37:16 -08:00
Schnayy
5c1c7cffe8 Sprite fixes 2020-03-01 04:01:29 -06:00
Heroman
b727038eb2 Fixes a teshari mining undercoat 2020-03-01 12:04:50 +10:00
Mechoid
21bac39c21 High-priority Job Display 2020-02-29 16:12:04 -08:00
Atermonera
d13336bbe6 Fixes communicator newsfeed app. (#6713)
* Fixes communicator newsfeed app.
Fixes non-terminal while loop in get_latest_news(), helper.dm
Newscaster posts now have a world.time-esque timestamp number, so they can be (almost) uniquely identified

* whoopsie
2020-02-29 15:05:02 -08:00
Atermonera
7903911e43 Merge pull request #6765 from Mechoid/BrainmechTargFix
Brainmechs can use guns again.
2020-02-29 15:03:43 -08:00
Novacat
5f799088e3 Nerfs Chameleon Kit Boxes (#6763)
* Nerfs Chameleon Kit Boxes

Because of the way chameleon kits start with items, the boxes start with a ton of storage slots to hold all the items. Sometimes people grab the boxes, dump out the original contents and stuff a ton of stuff into them as a result.

This refactors it so that all the chameleon stuff starts in the backpack instead, so chameleon kit boxes themselves are no longer superboxes

* Unnecessary comma
2020-02-29 15:01:39 -08:00
Atermonera
c8b32418ac Merge pull request #6760 from listerla/warble
Adds 'warble' emote for Skrell
2020-02-28 17:56:38 -08:00
Atermonera
381a6135e6 Merge pull request #6754 from listerla/handholding
Handholding
2020-02-28 17:56:17 -08:00
Atermonera
14883a98bb Merge pull request #6758 from TheFurryFeline/patch-7
[Oversight] Orion Trail Grammar Fixy
2020-02-28 17:54:05 -08:00
Mechoid
7f55089ad4 Brainmechs can use guns again. 2020-02-28 15:20:34 -08:00
TheFurryFeline
00e8c64a10 Weird thingy that gives proper grammar 2020-02-28 08:25:06 -05:00
Atermonera
597b3b32ee Merge pull request #6756 from Neerti/lightning_fixes
Fixes various lightning strike bugs
2020-02-27 20:57:41 -08:00
Atermonera
ea6bcafa2e Merge pull request #6755 from Neerti/feedback_for_devs
Devs can now View Feedback
2020-02-27 20:55:07 -08:00
Atermonera
aff506f6e6 Merge pull request #6752 from listerla/defib-charge
Defibrilators can be charged in rechargers
2020-02-27 20:54:03 -08:00
Atermonera
46c2c4c762 Merge pull request #6738 from VOREStation/vplk-sundry-fixes-runtimes
Fix Sundry Runtime Errors
2020-02-27 17:41:28 -08:00
lemon
18496911ee Adds warbling + raises dwoop volume 2020-02-26 23:43:00 -05:00
Atermonera
8079b7f771 Merge pull request #6744 from listerla/pda-holo
Adds holoPDA from Aurora
2020-02-26 18:03:51 -08:00
Atermonera
af9af8d880 Merge pull request #6747 from Neerti/pigs_in_blanket
Changes Pigs in a Blanket recipe
2020-02-26 18:01:30 -08:00