cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,227 Commits 73 Branches 18 Tags
b9d51da9e3453d81b106fb1bdb59d1571801fc44
Commit Graph

16966 Commits

Author SHA1 Message Date
ShiftyRail
b9d51da9e3 Midround bomberman (#21520) 
* Progress

* Whoops

* Test

* Fixes

* Landmarks and shit

* Additional fixes

* Duh
 2019-05-06 10:29:38 -05:00
DamianX
df475913aa Fixed targeted mind_affecting spells not checking for tinfoil hats (#22801) 2019-05-06 12:03:31 -03:00
DamianX
7e272707f6 AIs and cyborgs show up on the OOC crew manifest (#22786) 
* AIs and cyborgs show up on the OOC crew manifest

* did the thing idc
 2019-05-06 06:35:01 -03:00
Kurfursten
8ce2d8ba43 Merge pull request #22707 from GlassEclipse/glasseclipse-branch 
Cameras now have 5x5 and 7x7 by default.
 2019-05-05 15:07:42 -05:00
Kurfursten
8194eff9fa Merge pull request #22785 from PaulRitter/signaler_buff 
Signaler sanity
 2019-05-05 13:37:54 -05:00
Kurfursten
778522bc46 Merge pull request #22698 from brndd/fastborers 
Borers abandon host faster
 2019-05-05 13:11:18 -05:00
Kurfursten
a2dfd1d1f3 Merge pull request #22742 from DDihanov/check_antag_menu_fixes 
Check antag menu fixes
 2019-05-05 13:09:08 -05:00
Kurfursten
9acbc885de Merge pull request #22770 from I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE/ccccccccccccccccccccc 
Synthparrot
 2019-05-05 13:08:23 -05:00
Peter Wedder
662e55035c Reset selected laws in State Laws when laws change (#22777) 
* reset statelaws ui when laws change

* better put this here

* this should probably be in too
 2019-05-05 13:15:34 -04:00
Peter Wedder
6192ef4b45 fixed empty laws (#22790) 2019-05-05 13:12:06 -04:00
Dimitar Dihanov
cb5c2f7bad fixed stuff, added alert when no new objects are generated 2019-05-05 16:54:29 +03:00
Paul Ritter
c39115b7d2 whoops 2019-05-05 15:30:16 +02:00
Paul Ritter
5176183f42 raised signal chance and added sanitycheck to threatenverb 2019-05-05 15:11:36 +02:00
Peter Wedder
645fe1a653 removed statelaws from pais (#22769) 2019-05-04 20:17:58 -07:00
I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE
3080176916 Synthparrot 2019-05-04 21:32:30 -03:00
Peter Wedder
5bdd0233cb Giving silicons the option to plausibly lie about their laws (#22581) 
* Silicon freeform law stating

* html_encode fix

* commit

* does something but hte textarea dont work

* progress

* unused var

* commit pending json parser merge

* 90% feature complete

* pretty much feature complete

* ok this time it's feature complete

* Burninating references to the old state laws code

* use a class for the red warning

* this is here if I need it but I doubt I will

* fixes the FUCKING BUTTONS

* might as well allow intercoms

* let's see if this works

* don't forget the return, dummy

* ticking state_laws.dm

* no newline at end of file
 2019-05-04 20:49:27 -03:00
Peter Wedder
693769aa6b periods (#22766) 2019-05-04 14:07:56 -07:00
Kurfursten
ad7e551cd8 Merge pull request #22748 from PaulRitter/cmc_bugfixes 
cmc hotfixes
 2019-05-04 01:19:44 -05:00
I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE
85d2501f16 Empty pills delete themselves in IVs (#22755) 2019-05-03 16:50:38 -07:00
I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE
4016cc0f90 Pills fit in IV drips (#22695) 2019-05-03 16:04:12 -07:00
Paul Ritter
0cc27ea260 removed magic indexes + used DEAD define 2019-05-04 00:57:04 +02:00
Paul Ritter
075ac89a0d moved unconcious check and made an observer exception 2019-05-03 23:50:58 +02:00
Exxion
c3fa10c844 Fixes Nano with infinities/NaN again (#22740) 
* Fixes Nano with not-quite-valid JSON again, "properly" this time

* Deletes unused file
 2019-05-03 15:52:58 -03:00
Paul Ritter
5fa24f17b9 oopsies 2019-05-03 16:58:08 +02:00
Paul Ritter
c81535ce59 Merge branch 'Bleeding-Edge' into cmc_bugfixes 2019-05-03 14:54:57 +02:00
Paul Ritter
c664ef6464 no one line ifs 2019-05-03 14:53:39 +02:00
Paul Ritter
80b9bec1d8 replaced magic indexes with defines 2019-05-03 14:51:08 +02:00
GoodG1448
c9401324d0 Phenol properly reacts with plasticide for making plastic. (#22669) 
* Phenol properly reacts with plasticide for making plastic.

I made a plastellium plant that had Phenol and Plasticide, it didn't react to make plastic. Phenol wasn't reacting with the plasticide since there was no reaction.

* Probably fixed?
 2019-05-03 09:36:25 -03:00
ShiftyRail
49d66909d3 Attack logs transfered on ghosting/mind transfer (#22738) 
* Attack logs transfered on ghosting/mind transfer

* I swear officer I tested it
 2019-05-03 09:14:27 -03:00
Paul Ritter
19007c36c6 Tator codewords now appear in red when seen by other tators/nukeops (#22638) 
* changed how codephrases + responses get saved. now onto the handling of em

* phrases are now list and are being handled as such

* yes

* we modern here

* updated formatting

* fixes

* my initial idea but it actually works

* now not everyone sees the highlights

* done did the deed

* removed locations from syndie codeword pool
 2019-05-03 12:39:58 +02:00
Dimitar Dihanov
71da67123e added logs, generate objective fix, announce fix, custom obj fix, 
generate objective now distincts the old objectives from the new ones and logs/messages admins only for the added objective
 2019-05-02 23:50:08 +03:00
ddihanov
80009c4f14 check antag menu fixes 
still wip
 2019-05-02 14:52:20 +03:00
ShiftyRail
3a40e36395 Merge pull request #22736 from SirSkeleto/patch-4 
typo
 2019-05-02 13:05:41 +02:00
SirSkeleto
0cb44b3d9f typo 2019-05-02 06:47:16 -04:00
SonixApache
fcb0b630af puts teleport prefs under +FUN instead of +DEBUG (#22730) 2019-05-02 06:03:58 -03:00
Pieter-Jan Briers
4cd103e0e0 Make power cable multitool check use format_watts() (#22709) 2019-05-01 12:55:28 -07:00
AI-Is-Rogue
c927151775 Gives Vox sprites for telekinesis, heat/cold resistance and their combined counterpart. (#22725) 
* Add files via upload

* Makes telekinesis & heat/cold resist use Vox icons

* Allows Vox to use coldfire sprite
 2019-05-01 12:54:45 -07:00
GlassEclipse
35650f824a modified: code/modules/paperwork/photography.dm 2019-05-01 11:10:09 -05:00
GlassEclipse
940aa84f85 modified: code/modules/paperwork/photography.dm 2019-05-01 11:08:13 -05:00
GlassEclipse
0b300a4aaa modified: code/modules/paperwork/photography.dm 2019-05-01 11:02:01 -05:00
GlassEclipse
2ce2b7bbad modified: code/modules/paperwork/photocopier.dm 2019-05-01 10:58:37 -05:00
ShiftyRail
08a33d965d Merge pull request #22717 from PaulRitter/i_should_test_my_code 
paul should really test his hotfixes
 2019-05-01 14:51:16 +02:00
Peter Wedder
5943ec81fe mushmen pressure suit (#22716) 2019-05-01 05:49:04 -07:00
Paul Ritter
ae24bfeaa4 paul should really test his hotfixes 2019-05-01 14:18:54 +02:00
GlassEclipse
229a609094 Photography lag fix 2019-05-01 06:41:10 -05:00
GlassEclipse
a273cf0017 modified: code/modules/paperwork/photography.dm 2019-04-30 16:28:08 -05:00
GlassEclipse
6a49bf712a Photography 2019-04-30 15:42:29 -05:00
brndd
de56b2346f SECONDS 2019-04-30 20:33:56 +03:00
SonixApache
cd17a2507b Cafe and Bartending equipment crates now come with flatpacks (#22670) 
* Cafe and Bartending equipment crates now come with flatpacks

+ Cafe Equipment crate and Advanced Bartending Equipment crate are now large wooden crates that contain flatpacks for their respective machines.
- Flatpacks in the bartending crate don't stack

* stack flatpacks
 2019-04-30 09:45:54 -03:00
brndd
32ef5edb38 borers leave hosts in 5 seconds 2019-04-30 06:38:52 +03:00