cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,473 Commits 10 Branches 0 Tags
41d81a14efa4a20f4aaa3d269dfdc284d3b83e14
Commit Graph

16090 Commits

Author SHA1 Message Date
Amunak
41d81a14ef Buffed the research testing item, made more clear that it's for testing only. 2014-12-13 07:10:37 +01:00
Amunak
b60e9eedbe Added detailed research information to R&D console 
It lists 'desc' of each researched and 'buildable' datum/design, which was a previously unobtainable information. And it's all-access (just like technology level listing).
 2014-12-13 07:08:39 +01:00
Amunak
6e15257df9 R&D console refactor, formatting and output format improvements 2014-12-13 07:06:42 +01:00
Amunak
6419f3426e Destructor now asks for confirmation using alert instead of list 2014-12-13 07:02:54 +01:00
Amunak
ddc598702c Fixed typo. Apparently I'm bad with letters. 2014-12-11 11:31:47 +01:00
Amunak
94a93ac97d Reverted accidental changes to SMES building and RCON research 2014-12-11 11:27:01 +01:00
Amunak
1e769b4314 Attempt to normalize computer and circuit board names and their research names. 
Also moved RCON console board and SMES board where they belong. Formatted some board code and fixed some typos, too.

Cloning console renamed to Cloning Control Console.
The teleporter console is now called Teleporter Control Console.
The power monitor is now called Power Monitoring Console.
SMES board glass and acid construction price normalized (though other resources are still required; is that a good thing? It would be better to just introduce a new expensive part that is used to build it (if the coils aren't enough) rather than have a single board with atypical price.
 2014-12-10 20:37:18 +01:00
PsiOmegaDelta
44e8dd7153 Merge pull request #7359 from GinjaNinja32/machinedir 
Change unary-atmos machine (heater, freezer) construction to use constructing mob's dir
 2014-12-10 11:45:48 +01:00
PsiOmegaDelta
1327808386 Merge pull request #7275 from atlantiscze/substation-features 
RCON System
 2014-12-10 11:45:32 +01:00
Zuhayr
a3dc661c62 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-12-10 18:50:31 +10:30
Zuhayr
5730bcb885 Merged master/dev config.txt. 2014-12-10 16:35:39 +10:30
Zuhayr
1481c1e985 Merge pull request #7360 from SkyMarshal/astar-fix 
Fix/Cleanup for A* implementation
 2014-12-10 16:29:55 +10:30
Zuhayr
dda27082ba Merge pull request #7357 from mwerezak/infinity 
Prevents infinite loop
 2014-12-10 16:29:22 +10:30
ccomp5950
3414e48ceb Adds "paranoid" option to remove more powerful debug options from R_DEBUG. 
The purpose of this is to allow for testers on our test server without them having advance proc call which can do some fun stuff with python, etc.
    Also removes debug controller so that testers can't just edit the configuration to remove debugparanoid

    The default config is the status quo, you have to go out of your way and set this option in config to remove proccal from R_DEBUG
 2014-12-09 21:25:07 -05:00
GinjaNinja32
9c1fffc16a Change unary atmos machine construction to use constructing mob's dir 2014-12-10 01:49:23 +00:00
SkyMarshal
f44a58e358 Fixes the heap fix. 2014-12-09 18:42:54 -07:00
SkyMarshal
d3e64deb06 Fixes a small derp. 2014-12-09 18:42:53 -07:00
SkyMarshal
928a0fcf42 Refactors the AStar code to not be retarded. Works just like it used to. 2014-12-09 18:42:52 -07:00
mwerezak
0a6d1f8c81 Prevents infinite loop if a camera takes a picture of an atom with null in either it's overlays or underlays. 2014-12-09 17:19:02 -05:00
Atlantiscze
389b12091d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into substation-features 2014-12-09 20:48:56 +01:00
PsiOmega
52e6f96dc7 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-09 17:55:14 +01:00
Zuhayr
53627175ef Merge pull request #7347 from Baystation12/master 
Updating dev-freeze from master.
 2014-12-10 03:21:56 +10:30
Ccomp5950
cab064cd16 Merge pull request #7340 from Zuhayr/dev-freeze 
Dev-freeze fixes.
 2014-12-09 11:48:33 -05:00
Zuhayr
90f5da4e83 Merge pull request #7333 from PsiOmegaDelta/RadioWiresAreNotForYou 
Fixes #7323.
 2014-12-10 03:15:28 +10:30
PsiOmegaDelta
5842c17536 Merge pull request #7338 from Loganbacca/tapefix 
Tape fixes
 2014-12-09 17:44:23 +01:00
Zuhayr
61cb862690 Merge pull request #7300 from PsiOmegaDelta/RoundEnd 
Fixes #7295.
 2014-12-10 03:11:38 +10:30
Zuhayr
4aa7c072ca Merge pull request #7337 from Loganbacca/glassesfix 
Science goggles overlay fix
 2014-12-10 03:11:18 +10:30
PsiOmegaDelta
41cca1b250 Merge pull request #7303 from TwistedAkai/dev 
Implements existing assistant alternate job titles
 2014-12-09 17:34:31 +01:00
Zuhayr
39f303c50e Actually fixes hardsuit back icons. 2014-12-10 02:37:23 +10:30
Zuhayr
fea8868753 Fixes #7310 and should also fix #7311 2014-12-10 02:28:03 +10:30
Zuhayr
e80f59742d Fixes #7316 2014-12-10 00:56:26 +10:30
Amunak
e068d9f8d4 Blast doors' sprite now doesn't disappear when damaged - fixes #7341 2014-12-09 14:50:36 +01:00
Zuhayr
bc394b72d6 Fixes diona and simple_animals eating snacks. 2014-12-09 22:14:41 +10:30
Segrain
4fb83010e1 Fix for #7322. 2014-12-09 14:55:25 +03:00
Segrain
4ae3d3029f Fix for #6643. 2014-12-09 14:54:20 +03:00
Segrain
065d9b110c Fix for #6476. 2014-12-09 14:52:43 +03:00
Zuhayr
79fbc2cde9 Fixes autolathe menu. 2014-12-09 21:32:40 +10:30
PsiOmegaDelta
63a5d009c7 Merge pull request #7267 from GinjaNinja32/noise 
Audible emote improvement, adds ability to emote over radio.
 2014-12-09 11:54:57 +01:00
Zuhayr
7bc72fb836 Tidied up/fixed up the rig back icons. 2014-12-09 21:01:17 +10:30
Zuhayr
ff2c23714f Bunch of diona nymph tweaks/fixes. 2014-12-09 20:52:41 +10:30
Loganbacca
9fce8921ac Tape fixes 
- All paper variants now have taped icon states (might change this to an overlay in future)
- Tape objects inherit overlays from attached papers
 2014-12-09 22:53:49 +13:00
Loganbacca
2b98f70f9f Science goggles overlay fix 2014-12-09 22:05:14 +13:00
PsiOmega
48aeefa85a Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/talisman.dm
	maps/exodus-1.dmm
 2014-12-09 09:42:14 +01:00
PsiOmega
239eb2a0e8 Fixes #7323. 
pAIs no longer check and cut wires when interacting with radio functionality.
 2014-12-09 09:10:49 +01:00
PsiOmega
924955a4c8 Merge remote-tracking branch 'upstream/master' into dev-freeze 2014-12-09 09:07:38 +01:00
Zuhayr
6a8aa48cac Merge pull request #7309 from PsiOmegaDelta/DiscoIsDead 
Fixes #7308.
 2014-12-09 18:18:21 +10:30
Zuhayr
b44321775e Merge pull request #7276 from mwerezak/poster 
Poster fixes
 2014-12-09 18:17:46 +10:30
Segrain
4b7b910311 Fix for #7324. 2014-12-09 09:39:05 +03:00
PsiOmegaDelta
f9e59d430b Merge pull request #7329 from mwerezak/talisman 
Adds image for cult talismans
 2014-12-09 07:26:10 +01:00
mwerezak
ab89ce59dc Merge remote-tracking branch 'upstream/dev-freeze' into poster 
Conflicts:
	code/game/objects/effects/decals/contraband.dm
 2014-12-09 00:17:22 -05:00